#820 Dry-run for MCO

IBM · Dec 3, 2024 · cfa3881 · cfa3881
1 parent cd915ba
commit cfa3881
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-pause/tasks/pause-mco.yml b/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-pause/tasks/pause-mco.yml
@@ -31,12 +31,16 @@
   - not _mco_exists
   - _existing_ocp_infra_type != 'ibm-roks'
 
-- name: Pause the MachineConfig operator to disable rebooting of compute nodes
-  shell: |
-    oc patch --type=merge --patch='{"spec":{"paused":true}}' machineconfigpool/worker
+- include_role:
+    name: run-command
+  vars:
+    _p_command_description: Pause the MachineConfig operator to disable rebooting of compute nodes
+    _p_command: oc patch --type=merge --patch='{"spec":{"paused":true}}' machineconfigpool/worker
   when: 
   - _mco_exists
   - _existing_ocp_infra_type != 'aws-rosa'
 
 - include_tasks: non-mco-prepare-node-settings.yml
-  when: not _mco_exists
+  when: 
+  - not _mco_exists
+  - not cpd_dry_run
diff --git a/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-resume/tasks/main.yml b/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-resume/tasks/main.yml
@@ -8,4 +8,5 @@
 - name: Apply the node settings if the Machine Config Operator does not exist
   include_tasks: non-mco-apply-node-settings.yml
   when: 
-  - not _mco_exists
+  - not _mco_exists
+  - not cpd_dry_run
diff --git a/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-resume/tasks/resume-mco.yml b/automation-roles/50-install-cloud-pak/cpfs/cp-ocp-mco-resume/tasks/resume-mco.yml
@@ -1,7 +1,9 @@
 ---
-- name: Allow MachineConfig operator to reboot compute nodes again
-  shell: |
-    oc patch --type=merge --patch='{"spec":{"paused":false}}' machineconfigpool/worker
+- include_role:
+    name: run-command
+  vars:
+    _p_command_description: Allow MachineConfig operator to reboot compute nodes again
+    _p_command: oc patch --type=merge --patch='{"spec":{"paused":false}}' machineconfigpool/worker
 
 - name: Get number of compute nodes
   shell: |

diff --git a/automation-roles/60-configure-cloud-pak/cp4d/cp4d-configure-ssl-certificate/tasks/main.yml b/automation-roles/60-configure-cloud-pak/cp4d/cp4d-configure-ssl-certificate/tasks/main.yml
@@ -7,6 +7,7 @@
   shell: |
     oc get -n openshift-ingress-operator ingresscontrollers/default -o jsonpath='{.spec.defaultCertificate.name}'
   register: _current_ingress_certificate_result
+  failed_when: False
 
 - set_fact:
     _current_certificate: "{{ _current_ingress_certificate_result.stdout }}"