Merge pull request #1283 from mauricioharley/fix-ospcix-1264

openshift-merge-bot[bot] · web-flow · commit 9dae279497e2 · 2026-03-09T10:00:03.000Z
Skip barbican_adoption role when barbican is not enabled
diff --git a/tests/playbooks/test_minimal.yaml b/tests/playbooks/test_minimal.yaml
@@ -36,6 +36,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/playbooks/test_rollback_minimal.yaml b/tests/playbooks/test_rollback_minimal.yaml
@@ -37,6 +37,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/playbooks/test_rollback_with_ceph.yaml b/tests/playbooks/test_rollback_with_ceph.yaml
@@ -45,6 +45,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/playbooks/test_with_ceph.yaml b/tests/playbooks/test_with_ceph.yaml
@@ -45,6 +45,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/playbooks/test_with_ceph_and_ironic.yaml b/tests/playbooks/test_with_ceph_and_ironic.yaml
@@ -69,6 +69,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/playbooks/test_with_ironic.yaml b/tests/playbooks/test_with_ironic.yaml
@@ -57,6 +57,7 @@
     - role: barbican_adoption
       tags:
         - barbican_adoption
+      when: prelaunch_barbican_secret | default(false) | bool
     - role: neutron_adoption
       tags:
         - neutron_adoption
diff --git a/tests/roles/barbican_adoption/tasks/main.yaml b/tests/roles/barbican_adoption/tasks/main.yaml
@@ -91,7 +91,6 @@
   delay: "{{ barbican_retry_delay }}"
 
 - name: check that Barbican secret payload was migrated successfully
-  when: prelaunch_barbican_secret|default(false)
   ansible.builtin.shell: |
     {{ shell_header }}
     {{ oc_header }}
