fix oci yum mirror and add it to ocne2

Author: bgraef

ocne2/create_instance.yml

@@ -295,6 +295,14 @@
     - name: Configure instance
       ansible.builtin.include_tasks: "host_setup.yml"
 
+    - name: Change OCI YUM region
+      ansible.builtin.copy:
+        content: "{{ oci_yum_region | default(omit) }}"
+        dest: /etc/yum/vars/ociregion
+        mode: '0644'
+      become: true
+      when: oci_yum_region | default(omit) | length > 0
+
 - name: Update all rpm packages
   ansible.builtin.import_playbook: update_all_rpms.yml
   when: update_all

ocne2/default_vars.yml

@@ -27,4 +27,5 @@ ocne_cluster_node_options: ""
 ocne_cluster_name: "ocne"
 num_cp_nodes: 3
 num_wk_nodes: 3
-update_all: false
+update_all: false
+#oci_yum_region: ".uk-london-1"

ol/build.yml

@@ -7,109 +7,109 @@
 - name: Launch an instance using PV BV
   when: volume_type != "iscsi"
   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
+      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
   when: volume_type == "iscsi"
   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: 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:

ol/create_instance.yml

@@ -297,11 +297,11 @@
 
     - name: Change OCI YUM region
       ansible.builtin.copy:
-        content: "{{ oci_yum_region }}"
+        content: "{{ oci_yum_region | default(omit) }}"
         dest: /etc/yum/vars/ociregion
         mode: '0644'
       become: true
-      when: oci_yum_region | length > 0
+      when: oci_yum_region | default(omit) | length > 0
 
     - name: Configure passwordless SSH
       ansible.builtin.include_tasks: "passwordless_setup.yml"

ol/default_vars.yml

@@ -43,7 +43,7 @@ cleanup_tmp: no
 
 update_all: false
 passwordless_ssh: false
-#oci_yum_region: uk-london-1
+#oci_yum_region: ".uk-london-1"
 use_podman: false
 use_haproxy: false
 use_nginx: false