Skip to content

Commit ebf7e74

Browse files
author
Mauricio Harley
committed
Skip barbican_adoption role when barbican is not enabled
The barbican_adoption role runs unconditionally in all test playbooks, even when enable_barbican is set to false. When Barbican is not deployed on the source TripleO standalone, the KEK extraction fails with a KeyError and silently writes an empty BarbicanSimpleCryptoKEK to osp-secret. The barbican-operator then rejects the empty value with "empty password not allowed" (validation introduced by lib-common PR #672), and the job times out waiting for Barbican pods that are never created. Gate the barbican_adoption role on enable_barbican|default(true)|bool in all six test playbooks, consistent with how tls_adoption and telemetry_adoption are already gated. Signed-off-by: Mauricio Harley <mharley@redhat.com>
1 parent f93e14d commit ebf7e74

6 files changed

Lines changed: 6 additions & 0 deletions

File tree

tests/playbooks/test_minimal.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
- role: barbican_adoption
3737
tags:
3838
- barbican_adoption
39+
when: enable_barbican|default(true)|bool
3940
- role: neutron_adoption
4041
tags:
4142
- neutron_adoption

tests/playbooks/test_rollback_minimal.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
- role: barbican_adoption
3838
tags:
3939
- barbican_adoption
40+
when: enable_barbican|default(true)|bool
4041
- role: neutron_adoption
4142
tags:
4243
- neutron_adoption

tests/playbooks/test_rollback_with_ceph.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- role: barbican_adoption
4646
tags:
4747
- barbican_adoption
48+
when: enable_barbican|default(true)|bool
4849
- role: neutron_adoption
4950
tags:
5051
- neutron_adoption

tests/playbooks/test_with_ceph.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- role: barbican_adoption
4646
tags:
4747
- barbican_adoption
48+
when: enable_barbican|default(true)|bool
4849
- role: neutron_adoption
4950
tags:
5051
- neutron_adoption

tests/playbooks/test_with_ceph_and_ironic.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
- role: barbican_adoption
7070
tags:
7171
- barbican_adoption
72+
when: enable_barbican|default(true)|bool
7273
- role: neutron_adoption
7374
tags:
7475
- neutron_adoption

tests/playbooks/test_with_ironic.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
- role: barbican_adoption
5858
tags:
5959
- barbican_adoption
60+
when: enable_barbican|default(true)|bool
6061
- role: neutron_adoption
6162
tags:
6263
- neutron_adoption

0 commit comments

Comments
 (0)