stsstack-bundles

Merge ~hopem/stsstack-bundles:bug/1899999 into stsstack-bundles:master

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. bug/1899999
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: eae834d6493fdc4b4eb4e81dde780e14f793ab87
Proposed branch: ~hopem/stsstack-bundles:bug/1899999
Merge into: stsstack-bundles:master
Diff against target: 51 lines (+14/-1)
3 files modified
openstack/pipeline/02configure (+10/-1)
overlays/vault-openstack-certificates-aodh.yaml (+2/-0)
overlays/vault-openstack-certificates-ceilometer.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Heather Lemon (community) Approve
Jolly Bundlers Pending
Review via email: mp+392620@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Heather Lemon (hypothetical-lemon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
2index ea5f77c..42b512b 100644
3--- a/openstack/pipeline/02configure
4+++ b/openstack/pipeline/02configure
5@@ -483,16 +483,25 @@ do
6 MOD_OVERLAYS+=( "telemetry.yaml" )
7
8 if has_opt --vault; then
9- MOD_OVERLAYS+=( "gnocchi-vault.yaml" )
10+ MOD_OVERLAYS+=( "vault-openstack-certificates-gnocchi.yaml" )
11+ MOD_OVERLAYS+=( "vault-openstack-certificates-ceilometer.yaml" )
12+ MOD_OVERLAYS+=( "vault-openstack-certificates-aodh.yaml" )
13 fi
14 ;;
15 --telemetry-legacy-aodh)
16 # ceilometer + aodh + mongodb (<= pike)
17 MOD_OVERLAYS+=( "telemetry-legacy-aodh.yaml" )
18+ if has_opt --vault; then
19+ MOD_OVERLAYS+=( "vault-openstack-certificates-ceilometer.yaml" )
20+ MOD_OVERLAYS+=( "vault-openstack-certificates-aodh.yaml" )
21+ fi
22 ;;
23 --telemetry-legacy)
24 # ceilometer + mongodb (<= pike)
25 MOD_OVERLAYS+=( "telemetry-legacy.yaml" )
26+ if has_opt --vault; then
27+ MOD_OVERLAYS+=( "vault-openstack-certificates-ceilometer.yaml" )
28+ fi
29 ;;
30 --telemetry-ha*)
31 get_units $1 __NUM_TELEMETRY_UNITS__ 3
32diff --git a/overlays/vault-openstack-certificates-aodh.yaml b/overlays/vault-openstack-certificates-aodh.yaml
33new file mode 100644
34index 0000000..8afbf48
35--- /dev/null
36+++ b/overlays/vault-openstack-certificates-aodh.yaml
37@@ -0,0 +1,2 @@
38+relations:
39+ - ['aodh:certificates', 'vault:certificates']
40diff --git a/overlays/vault-openstack-certificates-ceilometer.yaml b/overlays/vault-openstack-certificates-ceilometer.yaml
41new file mode 100644
42index 0000000..fef0b46
43--- /dev/null
44+++ b/overlays/vault-openstack-certificates-ceilometer.yaml
45@@ -0,0 +1,2 @@
46+relations:
47+ - ['ceilometer:certificates', 'vault:certificates']
48diff --git a/overlays/gnocchi-vault.yaml b/overlays/vault-openstack-certificates-gnocchi.yaml
49similarity index 100%
50rename from overlays/gnocchi-vault.yaml
51rename to overlays/vault-openstack-certificates-gnocchi.yaml

Subscribers

People subscribed via source and target branches