Merge pull request #58 from bgraef/main

put different instance builds into blocks

Author: bgraef

ol/build.yml

@@ -5,92 +5,111 @@
 # See LICENSE.TXT for details.
 
 - name: Launch an instance using PV BV
-  oracle.oci.oci_compute_instance:
-    availability_domain: "{{ my_availability_domain }}"
-    compartment_id: "{{ my_compartment_id }}"
-    name: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
-    source_details:
-      image_id: "{{ ol_image_id }}"
-      source_type: image
-      boot_volume_size_in_gbs: "{{ item.value.boot_volume_size_in_gbs | default(50) | int }}"
-    shape: "{{ instance_shape }}"
-    shape_config:
-      ocpus: "{{ instance_ocpus }}"
-      memory_in_gbs: "{{ instance_memory }}"
-    create_vnic_details:
-      assign_public_ip: true
-      hostname_label: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
-      subnet_id: "{{ my_subnet_id }}"
-    metadata:
-      ssh_authorized_keys: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/' + private_key + '.pub') }}"
-    agent_config:
-      is_monitoring_disabled: false
-      is_management_disabled: false
-      are_all_plugins_disabled: false
-      plugins_config:
-        -
-          name: "OS Management Service Agent"
-          desired_state: DISABLED
-    key_by: [compartment_id, availability_domain, display_name]
-  register: result
   when: volume_type != "iscsi"
-  vars:
-    timestamp: "{{ now().strftime('%Y%m%d-%H%M%S') }}"
-  retries: 10
-  delay: 30
-  until: result is not failed
+  block:
+  - name: Launch an instance
+    oracle.oci.oci_compute_instance:
+      availability_domain: "{{ my_availability_domain }}"
+      compartment_id: "{{ my_compartment_id }}"
+      name: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
+      source_details:
+        image_id: "{{ ol_image_id }}"
+        source_type: image
+        boot_volume_size_in_gbs: "{{ item.value.boot_volume_size_in_gbs | default(50) | int }}"
+      shape: "{{ instance_shape }}"
+      shape_config:
+        ocpus: "{{ instance_ocpus }}"
+        memory_in_gbs: "{{ instance_memory }}"
+      create_vnic_details:
+        assign_public_ip: true
+        hostname_label: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
+        subnet_id: "{{ my_subnet_id }}"
+      metadata:
+        ssh_authorized_keys: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/' + private_key + '.pub') }}"
+      agent_config:
+        is_monitoring_disabled: false
+        is_management_disabled: false
+        are_all_plugins_disabled: false
+        plugins_config:
+          -
+            name: "OS Management Service Agent"
+            desired_state: DISABLED
+      key_by: [compartment_id, availability_domain, display_name]
+    register: result    
+    vars:
+      timestamp: "{{ now().strftime('%Y%m%d-%H%M%S') }}"
+    retries: 10
+    delay: 30
+    until: result is not failed
+
+  - name: Print instance details
+    ansible.builtin.debug:
+      msg:
+        - "Launched a new instance:"
+        - "{{ result }}"
+    when: debug_enabled
+
+  - name: Set the compute instance id
+    ansible.builtin.set_fact:
+      instance_id: "{{ result.instance.id }}"
+
+  - name: Set the compute instance display_name
+    ansible.builtin.set_fact:
+      instance_display_name: "{{ result.instance.display_name }}"
 
 - name: Launch an instance using iSCSI BV
-  oracle.oci.oci_compute_instance:
-    availability_domain: "{{ my_availability_domain }}"
-    compartment_id: "{{ my_compartment_id }}"
-    name: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
-    source_details:
-      image_id: "{{ ol_image_id }}"
-      source_type: image
-      boot_volume_size_in_gbs: "{{ item.value.boot_volume_size_in_gbs | default(50) | int }}"
-    shape: "{{ instance_shape }}"
-    shape_config:
-      ocpus: "{{ instance_ocpus }}"
-      memory_in_gbs: "{{ instance_memory }}"
-    create_vnic_details:
-      assign_public_ip: true
-      hostname_label: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
-      subnet_id: "{{ my_subnet_id }}"
-    metadata:
-      ssh_authorized_keys: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/' + private_key + '.pub') }}"
-    agent_config:
-      is_monitoring_disabled: false
-      is_management_disabled: false
-      are_all_plugins_disabled: false
-      plugins_config:
-        - name: "OS Management Service Agent"
-          desired_state: DISABLED
-        - name: "Block Volume Management"
-          desired_state: ENABLED
-    key_by: [compartment_id, availability_domain, display_name]
-  register: result
   when: volume_type == "iscsi"
-  vars:
-    timestamp: "{{ now().strftime('%Y%m%d-%H%M%S') }}"
-  retries: 10
-  delay: 30
-  until: result is not failed
-
-- name: Print instance details
-  ansible.builtin.debug:
-    msg:
-      - "Launched a new instance:"
-      - "{{ result }}"
-  when: debug_enabled
-
-- name: Set the compute instance id
-  ansible.builtin.set_fact:
-    instance_id: "{{ result.instance.id }}"
-
-- name: Set the compute instance display_name
-  ansible.builtin.set_fact:
-    instance_display_name: "{{ result.instance.display_name }}"
+  block:
+  - name: Launch an instance
+    oracle.oci.oci_compute_instance:
+      availability_domain: "{{ my_availability_domain }}"
+      compartment_id: "{{ my_compartment_id }}"
+      name: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
+      source_details:
+        image_id: "{{ ol_image_id }}"
+        source_type: image
+        boot_volume_size_in_gbs: "{{ item.value.boot_volume_size_in_gbs | default(50) | int }}"
+      shape: "{{ instance_shape }}"
+      shape_config:
+        ocpus: "{{ instance_ocpus }}"
+        memory_in_gbs: "{{ instance_memory }}"
+      create_vnic_details:
+        assign_public_ip: true
+        hostname_label: "{{ item.value.instance_name | default('instance-'~timestamp) }}"
+        subnet_id: "{{ my_subnet_id }}"
+      metadata:
+        ssh_authorized_keys: "{{ lookup('file', lookup('env', 'HOME') + '/.ssh/' + private_key + '.pub') }}"
+      agent_config:
+        is_monitoring_disabled: false
+        is_management_disabled: false
+        are_all_plugins_disabled: false
+        plugins_config:
+          - name: "OS Management Service Agent"
+            desired_state: DISABLED
+          - name: "Block Volume Management"
+            desired_state: ENABLED
+      key_by: [compartment_id, availability_domain, display_name]
+    register: result
+    vars:
+      timestamp: "{{ now().strftime('%Y%m%d-%H%M%S') }}"
+    retries: 10
+    delay: 30
+    until: result is not failed
+
+  - name: Print instance details
+    ansible.builtin.debug:
+      msg:
+        - "Launched a new instance:"
+        - "{{ result }}"
+    when: debug_enabled
+
+  - name: Set the compute instance id
+    ansible.builtin.set_fact:
+      instance_id: "{{ result.instance.id }}"
+
+  - name: Set the compute instance display_name
+    ansible.builtin.set_fact:
+      instance_display_name: "{{ result.instance.display_name }}"
 
 - name: Get the vnic attachment details of instance
   oracle.oci.oci_compute_vnic_attachment_facts: