Commit e3308d6
Mauricio Harley
Skip barbican_adoption role when barbican is not enabled
The barbican_adoption role runs unconditionally in all test playbooks,
even 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 prelaunch_barbican_secret, which is
already written to vars.yaml by the deploy playbook with the value of
enable_barbican. This is consistent with how tls_adoption and
telemetry_adoption are already gated on variables present in vars.yaml.
Signed-off-by: Mauricio Harley <mharley@redhat.com>1 parent ebf7e74 commit e3308d6
7 files changed
Lines changed: 6 additions & 7 deletions
File tree
- tests
- playbooks
- roles/barbican_adoption/tasks
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
| 60 | + | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
95 | 94 | | |
96 | 95 | | |
97 | 96 | | |
| |||
0 commit comments