Merge pull request #174 from zhengxiaomei123/xmzheng

[cloud_infra_center]Fix create_control_server error
IBM · Nov 11, 2022 · bee8269 · bee8269
2 parents 3475ee3 + 19c9a63
commit bee8269
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
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
@@ -91,8 +91,8 @@
   - 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'
+    - create_master.failed == true
+    - '"ValueError: dictionary update sequence element #0 has length 1; 2 is required" not in create_master | string'
 
 
 - name: 'Create the control servers'
@@ -121,8 +121,8 @@
   - vm_type == "zvm"
   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'
+    - create_master.failed == true
+    - '"ValueError: dictionary update sequence element #0 has length 1; 2 is required" not in create_master | string'
 
 - name: 'Convert master flavor from value into number'
   command:
@@ -161,8 +161,8 @@
   - volume_type_id is not defined
   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'
+    - create_master.failed == true
+    - '"ValueError: dictionary update sequence element #0 has length 1; 2 is required" not in create_master | string'
 
 - name: Create control boot volume
   os_volume:

diff --git a/...sioning/cloud_infra_center/ocp_upi/roles/configure-installer-client-local/tasks/main.yaml b/...sioning/cloud_infra_center/ocp_upi/roles/configure-installer-client-local/tasks/main.yaml
@@ -14,14 +14,12 @@
   get_url:
     url: '{{ local_openshift_install }}'
     dest: ./openshift-install-linux.tar.gz
-    dest: .
 
 
 - name: Download openshift client
   get_url:
     url: '{{ local_openshift_client }}'
     dest: ./openshift-client-linux.tar.gz
-    dest: .
 
 - name: Unzip openshift client archive
   command: