Merge pull request #172 from shhull/update-rhcos-image

[cloud_infra_center] update rhcos image and add gz_sha256 to verify image
IBM · Oct 20, 2022 · e7af049 · e7af049
2 parents ddeb2b6 + 86d316c
commit e7af049
Show file tree

Hide file tree

Showing 7 changed files with 178 additions and 38 deletions.
diff --git a/z_infra_provisioning/cloud_infra_center/ocp_upi/add-new-compute-node.yaml b/z_infra_provisioning/cloud_infra_center/ocp_upi/add-new-compute-node.yaml
@@ -97,7 +97,22 @@
   - name: 'Create the compute servers'
     os_server:
       name: "{{ item }}"
-      image: "rhcos"
+      image: "icic_rhcos_qcow2"
+      flavor: "{{ os_flavor_worker }}"
+      auto_ip: no
+      timeout: "{{ create_server_timeout|int * 60 }}"
+      userdata: "{{ lookup('file', [ item , 'ignition.json'] | join('-'))  | string }}"
+      availability_zone: "{{ create_server_zone }}"
+      nics:
+        - port-name: "{{ item }}"
+    with_lines: cat .new_worker_name
+    when:
+    - vm_type == "kvm"
+
+  - name: 'Create the compute servers'
+    os_server:
+      name: "{{ item }}"
+      image: "icic_rhcos_{{ disk_type }}"
       flavor: "{{ os_flavor_worker }}"
       auto_ip: no
       timeout: "{{ create_server_timeout|int * 60 }}"
@@ -108,6 +123,7 @@
     with_lines: cat .new_worker_name
     when:
     - disk_type == "dasd"
+    - vm_type == "zvm"
 
   - name: 'Convert compute server flavor from value into number'
     command:
@@ -119,7 +135,7 @@
   - name: 'Create the compute servers with default boot volume'
     os_server:
       name: "{{ item }}"
-      image: "rhcos"
+      image: "icic_rhcos_{{ disk_type }}"
       flavor: "{{ os_flavor_worker }}"
       auto_ip: no
       timeout: "{{ create_server_timeout|int * 60 }}"
@@ -133,20 +149,22 @@
     with_lines: cat .new_worker_name
     when:
     - disk_type == "scsi"
+    - vm_type == "zvm"
     - volume_type_id is not defined
 
   - name: 'Create compute boot volume'
     os_volume:
       state: present
       name: "{{ item }}-boot"
-      image: "rhcos"
+      image: "icic_rhcos_{{ disk_type }}"
       size: "{{ compute_flavor_size.stdout_lines[0]}}"
       volume_type: "{{ volume_type_id }}"
       metadata: "{{ cluster_id_tag }}"
       timeout: "{{ create_server_timeout|int * 60 }}" 
     with_lines: cat .new_worker_name
     when:
     - disk_type == "scsi"
+    - vm_type == "zvm"
     - volume_type_id is defined
 
   - name: 'Set compute volume bootable'
@@ -172,6 +190,7 @@
     with_lines: cat .new_worker_name
     when:
     - disk_type == "scsi"
+    - vm_type == "zvm"
     - volume_type_id is defined
 
   - name: 'Update worker ip into new_worker_index file'

diff --git a/z_infra_provisioning/cloud_infra_center/ocp_upi/destroy-images.yaml b/z_infra_provisioning/cloud_infra_center/ocp_upi/destroy-images.yaml
@@ -26,10 +26,29 @@
   tasks:
 
   - name: Get existing rhcos image from ICIC glance
-    shell: "openstack image list --format value| grep -w 'rhcos'| wc -l"
+    shell: "openstack image list --format value| grep -w 'icic_rhcos_qcow2'| wc -l"
     register: icic_rhcos_count
+    when:
+    - vm_type == "kvm"
 
   - name: 'Remove the rhcos image'
     shell:
-      cmd: "openstack image delete rhcos"
-    when: icic_rhcos_count.stdout | int == 1
+      cmd: "openstack image delete icic_rhcos_qcow2"
+    when: 
+    - vm_type == "kvm"
+    - icic_rhcos_count is defined
+    - icic_rhcos_count.stdout | int == 1
+
+  - name: Get existing rhcos image from ICIC glance
+    shell: "openstack image list --format value| grep -w 'icic_rhcos_{{ disk_type }}'| wc -l"
+    register: icic_rhcos_count
+    when:
+    - vm_type == "zvm"
+
+  - name: 'Remove the rhcos image'
+    shell:
+      cmd: "openstack image delete icic_rhcos_{{ disk_type }}"
+    when: 
+    - vm_type == "zvm"
+    - icic_rhcos_count is defined
+    - icic_rhcos_count.stdout | int == 1
diff --git a/z_infra_provisioning/cloud_infra_center/ocp_upi/roles/configure-bootstrap/tasks/main.yaml b/z_infra_provisioning/cloud_infra_center/ocp_upi/roles/configure-bootstrap/tasks/main.yaml
@@ -41,7 +41,22 @@
 - name: 'Create the bootstrap server'
   os_server:
     name: "{{ os_bootstrap_server_name }}"
-    image: "rhcos"
+    image: "icic_rhcos_qcow2"
+    flavor: "{{ os_flavor_bootstrap }}"
+    userdata: "{{ lookup('file', os_bootstrap_ignition) | string }}"
+    timeout: "{{ create_server_timeout|int * 60 }}" 
+    auto_ip: no
+    availability_zone: "{{ create_server_zone }}"
+    nics:
+    - port-name: "{{ os_port_bootstrap }}"
+    meta: "{{ cluster_id_tag }}"
+  when:
+  - vm_type == "kvm"
+
+- name: 'Create the bootstrap server'
+  os_server:
+    name: "{{ os_bootstrap_server_name }}"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_bootstrap }}"
     userdata: "{{ lookup('file', os_bootstrap_ignition) | string }}"
     timeout: "{{ create_server_timeout|int * 60 }}" 
@@ -52,18 +67,20 @@
     meta: "{{ cluster_id_tag }}"
   when:
   - disk_type == "dasd"
+  - vm_type == "zvm"
 
 - name: 'Convert bootstrap flavor from value into number'
   command:
     cmd: "openstack flavor show {{ os_flavor_bootstrap }} -c disk -f value"
   register: bootstrap_flavor_size
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
 
 - name: 'Create the bootstrap server with default boot volume'
   os_server:
     name: "{{ os_bootstrap_server_name }}"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_bootstrap }}"
     userdata: "{{ lookup('file', os_bootstrap_ignition) | string }}"
     timeout: "{{ create_server_timeout|int * 60 }}" 
@@ -77,25 +94,28 @@
     terminate_volume: True
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is not defined
 
 - name: 'Create bootstrap boot volume'
   os_volume:
     state: present
     name: "{{ os_bootstrap_server_name }}-boot"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     size: "{{ bootstrap_flavor_size.stdout_lines[0]}}"
     volume_type: "{{ volume_type_id }}"
     metadata: "{{ cluster_id_tag }}"
     timeout: "{{ create_server_timeout|int * 60 }} "
   when: 
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Set bootstrap volume bootable'
   shell: openstack --os-volume-api-version=3 volume set --bootable "{{ os_bootstrap_server_name }}-boot"
   when: 
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Create the bootstrap server with boot volume'
@@ -113,4 +133,5 @@
     terminate_volume: True
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
diff --git a/...fra_provisioning/cloud_infra_center/ocp_upi/roles/configure-compute-nodes/tasks/main.yaml b/...fra_provisioning/cloud_infra_center/ocp_upi/roles/configure-compute-nodes/tasks/main.yaml
@@ -46,7 +46,23 @@
 - name: 'Create the compute servers'
   os_server:
     name: "{{ item.1 }}-{{ item.0 }}"
-    image: "rhcos"
+    image: "icic_rhcos_qcow2"
+    flavor: "{{ os_flavor_worker }}"
+    auto_ip: no
+    availability_zone: "{{ create_server_zone }}"
+    timeout: "{{ create_server_timeout|int * 60 }}" 
+    userdata: "{{ lookup('file', [item.1, item.0, 'ignition.json'] | join('-')) | string }}"
+    nics:
+    - port-name: "{{ os_port_worker }}-{{ item.0 }}"
+    meta: "{{ cluster_id_tag }}"
+  with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
+  when:
+  - vm_type == "kvm"
+
+- name: 'Create the compute servers'
+  os_server:
+    name: "{{ item.1 }}-{{ item.0 }}"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_worker }}"
     auto_ip: no
     availability_zone: "{{ create_server_zone }}"
@@ -58,6 +74,7 @@
   with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
   when:
   - disk_type == "dasd"
+  - vm_type == "zvm"
 
 - name: 'Convert compute node flavor from value into number'
   command:
@@ -69,7 +86,7 @@
 - name: 'Create the compute servers with default boot volume'
   os_server:
     name: "{{ item.1 }}-{{ item.0 }}"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_worker }}"
     auto_ip: no
     availability_zone: "{{ create_server_zone }}"
@@ -84,27 +101,30 @@
   with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is not defined
 
 - name: 'Create compute boot volume'
   os_volume:
     state: present
     name: "{{ item.1 }}-{{ item.0 }}-boot"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     size: "{{ compute_flavor_size.stdout_lines[0]}}"
     volume_type: "{{ volume_type_id }}"
     metadata: "{{ cluster_id_tag }}"
     timeout: "{{ create_server_timeout|int * 60 }}" 
   with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Set compute volume bootable'
   shell: openstack --os-volume-api-version=3 volume set --bootable "{{ item.1 }}-{{ item.0 }}-boot"
   with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
   when: 
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Create the compute server with boot volume'
@@ -123,4 +143,5 @@
   with_indexed_items: "{{ [os_compute_server_name] * os_compute_nodes_number }}"
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
diff --git a/...fra_provisioning/cloud_infra_center/ocp_upi/roles/configure-control-plane/tasks/main.yaml b/...fra_provisioning/cloud_infra_center/ocp_upi/roles/configure-control-plane/tasks/main.yaml
@@ -69,7 +69,36 @@
 - name: 'Create the control servers'
   os_server:
     name: "{{ item.1 }}-{{ item.0 }}"
-    image: "rhcos"
+    image: "icic_rhcos_qcow2"
+    flavor: "{{ os_flavor_master }}"
+    auto_ip: no
+    availability_zone: "{{ create_server_zone }}"
+    timeout: "{{ create_server_timeout|int * 60 }}" 
+    # The ignition filename will be concatenated with the Control Plane node
+    # name and its 0-indexed serial number.
+    # In this case, the first node will look for this filename:
+    #    "{{ infraID }}-master-0-ignition.json"
+    userdata: "{{ lookup('file', [item.1, item.0, 'ignition.json'] | join('-')) | string }}"
+    nics:
+    - port-name: "{{ os_port_master }}-{{ item.0 }}"
+    scheduler_hints:
+      group: "{{ server_group_id }}"
+    meta: "{{ cluster_id_tag }}"
+  with_indexed_items: "{{ [os_cp_server_name] * os_control_nodes_number }}"
+  environment: 
+    PYTHONWARNINGS: 'ignore::UserWarning'
+  when:
+  - vm_type == "kvm"
+  register: create_master
+  failed_when:
+    - '"failed: [localhost]" in create_master'
+    - '"ValueError: dictionary update sequence element #0 has length 1; 2 is required" not in create_master'
+
+
+- name: 'Create the control servers'
+  os_server:
+    name: "{{ item.1 }}-{{ item.0 }}"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_master }}"
     auto_ip: no
     availability_zone: "{{ create_server_zone }}"
@@ -89,6 +118,7 @@
     PYTHONWARNINGS: 'ignore::UserWarning'
   when:
   - disk_type == "dasd"
+  - vm_type == "zvm"
   register: create_master
   failed_when:
     - '"failed: [localhost]" in create_master'
@@ -104,7 +134,7 @@
 - name: 'Create the control servers with default boot volume'
   os_server:
     name: "{{ item.1 }}-{{ item.0 }}"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     flavor: "{{ os_flavor_master }}"
     auto_ip: no
     availability_zone: "{{ create_server_zone }}"
@@ -127,6 +157,7 @@
     PYTHONWARNINGS: 'ignore::UserWarning'
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is not defined
   register: create_master
   failed_when:
@@ -137,21 +168,23 @@
   os_volume:
     state: present
     name: "{{ item.1 }}-{{ item.0 }}-boot"
-    image: "rhcos"
+    image: "icic_rhcos_{{ disk_type }}"
     size: "{{ master_flavor_size.stdout_lines[0]}}"
     volume_type: "{{ volume_type_id }}"
     metadata: "{{ cluster_id_tag }}"
     timeout: "{{ create_server_timeout|int * 60 }}" 
   with_indexed_items: "{{ [os_cp_server_name] * os_control_nodes_number }}"
   when: 
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Set control volume bootable'
   shell: openstack --os-volume-api-version=3 volume set --bootable "{{ item.1 }}-{{ item.0 }}-boot"
   with_indexed_items: "{{ [os_cp_server_name] * os_control_nodes_number }}"
   when: 
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
 
 - name: 'Create the control server with boot volume'
@@ -172,4 +205,5 @@
     PYTHONWARNINGS: 'ignore::UserWarning'
   when:
   - disk_type == "scsi"
+  - vm_type == "zvm"
   - volume_type_id is defined
diff --git a/...isioning/cloud_infra_center/ocp_upi/roles/configure-installer-rhcos-local/tasks/main.yaml b/...isioning/cloud_infra_center/ocp_upi/roles/configure-installer-rhcos-local/tasks/main.yaml
@@ -52,14 +52,14 @@
 
 - name: Upload RHCOS image to ICIC glance
   command: 
-    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=raw  --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=ZVM --property disk_type=SCSI --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.raw rhcos
+    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=raw  --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=ZVM --property disk_type=SCSI --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.raw icic_rhcos_{{ disk_type }}
   when: 
   - vm_type == "zvm"
   - disk_type == "scsi"
 
 - name: Upload RHCOS image to ICIC glance
   command: 
-    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=raw  --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=ZVM --property disk_type=DASD --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.raw rhcos
+    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=raw  --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=ZVM --property disk_type=DASD --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.raw icic_rhcos_{{ disk_type }}
   when: 
   - vm_type == "zvm"
   - disk_type == "dasd"
@@ -83,7 +83,7 @@
 
 - name: Upload RHCOS image to ICIC glance
   command: 
-    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=qcow2 --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=kvm --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.qcow2 rhcos
+    cmd: openstack image create --tag {{ cluster_id_tag }} --disk-format=qcow2 --property architecture=s390x --property os_name=Linux --property os_version=RHCOS{{ openshift_version }} --property os_distro=RHCOS{{ openshift_version }} --property hypervisor_type=kvm --file=rhcos-{{ openshift_version }}.{{ openshift_minor_version }}-s390x.qcow2 icic_rhcos_qcow2
   when: 
   - vm_type == "kvm"