Mitigate impact of failing block+recover on ansible_play_hosts

aristanetworks · Oct 9, 2024 · f556e9e · f556e9e
1 parent 8e9f806
commit f556e9e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/cc_false.yml b/ansible_collections/arista/avd/molecule/cv_deploy/cc_false.yml
@@ -49,6 +49,7 @@
         that:
           # Change control
           - cv_deploy_results.change_control.requested_state == "pending approval"
+          - cv_deploy_results.change_control.requested_state == cv_deploy_results.change_control.state
 
     - name: Cleanup orphan CC
       run_once: true

diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/converge.yml b/ansible_collections/arista/avd/molecule/cv_deploy/converge.yml
@@ -5,11 +5,11 @@
 - name: Test Provisions with Workspace Pending
   import_playbook: workspace_pending.yml
 
-- name: Test Change Control False
-  import_playbook: cc_false.yml
-
 - name: Test Workspace Force True
   import_playbook: workspace_force_true.yml
 
 - name: Test Workspace Force False
   import_playbook: workspace_force_false.yml
+
+- name: Test Change Control False
+  import_playbook: cc_false.yml
diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_false.yml b/ansible_collections/arista/avd/molecule/cv_deploy/workspace_force_false.yml
@@ -42,7 +42,7 @@
           ansible.builtin.import_role:
             name: arista.avd.cv_deploy
           vars:
-            cv_devices: [ avd-ci-core1 ]
+            cv_devices: [ avd-ci-leaf1, avd-ci-core1 ]
             cv_submit_workspace_force: false
       rescue:
         - name: Check CVP returns
@@ -85,15 +85,21 @@
       retries: 3
       delay: 3
       ignore_errors: True
+      when: cv_deploy_results.workspace.id is not none and cv_deploy_results.workspace.id | length > 0
 
     - name: Cleanup
       run_once: true
       delegate_to: localhost
       ansible.builtin.import_role:
         name: arista.avd.cv_deploy
       vars:
+        cv_devices: "{{ ansible_play_hosts_all }}"
         eos_config_dir: "{{ playbook_dir }}/intended/configs/base_configs"
         structured_dir: "{{ playbook_dir }}/intended/structured_configs/base_configs"
         cv_submit_workspace: true
         cv_submit_workspace_force: true
         cv_run_change_control: true
+
+    # Clear failed state of failed hosts for next engaged playbook (no impact within running playbook)
+    - name: Reset ansible_play_hosts for next playbook (no impact within running playbook)
+      ansible.builtin.meta: clear_host_errors
diff --git a/ansible_collections/arista/avd/molecule/cv_deploy/workspace_pending.yml b/ansible_collections/arista/avd/molecule/cv_deploy/workspace_pending.yml
@@ -77,6 +77,7 @@
       retries: 3
       delay: 3
       ignore_errors: True
+      when: cv_deploy_results.workspace.id is not none and cv_deploy_results.workspace.id | length > 0
 
     - name: Cleanup
       run_once: true