ROX-31357: Backport IBM VM creation fixes (#2630)

* Swaps ibmcloud region to us-east for s390x (#2372)
* Update ansible tasks for ppc64le (#2097)

Co-authored-by: jdao-rh <[email protected]>
Co-authored-by: Afsan Hossain <[email protected]>

Author: 3 people

ansible/requirements.yml

@@ -5,5 +5,4 @@ collections:
 - community.docker
 - containers.podman
 - kubernetes.core
-- name: ibm.cloudcollection
-  version: 1.51.0
+- ibm.cloudcollection

ansible/roles/create-vm/tasks/create-ppc64le-vm.yml

@@ -53,8 +53,7 @@
     pi_cloud_instance_id: "{{ pi_cloud_instance_id }}"
   failed_when:
     - pi_network_existing_output.rc != 0
-    - '"unable to get network" not in pi_network_existing_output.stderr'
-    - '"Error:item not found" not in pi_network_existing_output.stderr'
+    - '"could not be found" not in pi_network_existing_output.stderr'
   register: pi_network_existing_output
 
 - set_fact:
@@ -132,12 +131,12 @@
 
 - name: Print Public IP Address
   debug:
-    var: pi_instance.addresses[0].external_ip
+    var: pi_instance.networks[0].external_ip
 
 - name: Add VSI to Ansible inventory
   add_host:
     name: "{{ pi_name }}"
-    ansible_host: "{{ pi_instance.addresses[0].external_ip }}"
+    ansible_host: "{{ pi_instance.networks[0].external_ip }}"
     ansible_user: root
     groups:
       - job_id_{{ job_id }}

ansible/roles/destroy-vm/tasks/destroy-ppc64le-vm.yml

@@ -26,7 +26,7 @@
 - name: Save network details
   delegate_to: localhost
   set_fact:
-    public_subnet: "{{ pi_instance.addresses|rejectattr('external_ip', 'equalto', '') | list | first }}"
+    public_subnet: "{{ pi_instance.networks|rejectattr('external_ip', 'equalto', '') | list | first }}"
   when: pi_instance_existing_output.rc == 0
 
 - name: Delete instance by id

ansible/vars/s390x.yml

@@ -3,24 +3,24 @@
 
 s390x:
   #rhel-8-6-s390x
-  vsi_image_id: r038-0d89bf54-c28f-4dc4-bec0-0f8e03a74de3
+  vsi_image_id: r014-bd269dc6-aa79-4998-b2bc-1eccbda68ed2
   vsi_profile: bz2-2x8
 
   # IBM Cloud setup
-  # vpc_name: lei-vpc-toronto
-  vpc_id: r038-c4f8e233-4b56-44bd-af71-140ebd1664e9
-  # subnet_name: stackrox-ci-sn3 (ca-tor-3)
+  # vpc_name: stackrox-vpc-us-east
+  vpc_id: r014-c42556dc-1754-488c-a94f-e384fee53bcd
+  # subnet_name: stackrox-ci-sn3 (us-east-2)
   # subnet_id: 02s7-0fca7f4f-7e53-40d5-a087-f8cb5d7ab682
   #
-  # ca-tor-2
-  subnet_id: 02r7-68814545-4e23-4fe9-b557-a557f03a2b71
-  zone: ca-tor-2
-  # ssh_key_name: acs-sshkey
-  ssh_key_id: r038-fb0260c7-c01d-45c8-8026-7d50042943b9
+  # us-east-2
+  subnet_id: 0767-43e68696-83cd-4072-9741-74543bbc2696
+  zone: us-east-2
+  # ssh_key_name: acs-sshkey-us-east
+  ssh_key_id: r014-e3c69aa9-d9ea-4950-92e5-65406d6a785c
   # vsi_resource_group: stackrox-ci-resource-group
   vsi_resource_group_id: 1a33a6a9bd6e498f8115e9b1064bfa97
   disk_size: "{{ ibm_disk_size }}"
 
   env:
     IC_API_KEY: "{{ lookup('env', 'IBM_CLOUD_S390X_API_KEY') }}"
-    IC_REGION: ca-tor
+    IC_REGION: us-east