Fixed some typos retrying failed oc debug commands.

project-faros · Aug 2, 2021 · 2c902ef · 2c902ef
1 parent 5544fe2
commit 2c902ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/playbooks/deploy.d/container-storage/local-storage.yml b/app/playbooks/deploy.d/container-storage/local-storage.yml
@@ -11,7 +11,7 @@
       changed_when: false
       retries: 10
       delay: 1
-      until: cluster_drives is success
+      until: drive_id_lkp is success
 
     - name: save storage node drive id paths
       set_fact:

diff --git a/app/playbooks/deploy.d/wipefs/wipe-host.yml b/app/playbooks/deploy.d/wipefs/wipe-host.yml
@@ -6,38 +6,38 @@
   ignore_errors: true
   retries: 10
   delay: 1
-  until: cluster_drives is success
+  until: vgs is success
 
 - name: delete associated vgs
   shell: "oc debug -n default node/{{ outer.host }} -- chroot /host vgremove --force --noudevsync '{{ item.stdout }}'"
   changed_when: true
   when: item.stdout != ""
   loop: "{{ vgs.results }}"
+  register: vg_delete
   retries: 10
   delay: 1
-  until: cluster_drives is success
+  until: vg_delete is success
 
 - name: remove pvs
   shell: "oc debug -n default node/{{ outer.host }} -- chroot /host pvremove '/dev/{{ item }}'"
   loop: "{{ outer.drives }}"
   changed_when: true
   ignore_errors: true
-  retries: 10
-  delay: 1
-  until: cluster_drives is success
 
 - name: wipe filesystem
   shell: "oc debug -n default node/{{ outer.host }} -- chroot /host wipefs -a '/dev/{{ item }}'"
   loop: "{{ outer.drives }}"
   changed_when: true
+  register: wipefs
   retries: 10
   delay: 1
-  until: cluster_drives is success
+  until: wipefs is success
 
 - name: clear GPT and MBR structures
   shell: "oc debug -n default node/{{ outer.host }} -- chroot /host sgdisk --zap-all '/dev/{{ item }}'"
   loop: "{{ outer.drives }}"
   changed_when: true
+  register: sgdisk
   retries: 10
   delay: 1
-  until: cluster_drives is success
+  until: sgdisk is success