stsstack-bundles

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

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. bug/1861143
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 1d2fedd046438c740793fab665d3d0b7c55e0cbe
Proposed branch: ~hopem/stsstack-bundles:bug/1861143
Merge into: stsstack-bundles:master
Diff against target: 67 lines (+21/-1)
6 files modified
openstack/pipeline/02configure (+7/-1)
overlays/vault-openstack-certificates-barbican.yaml (+2/-0)
overlays/vault-openstack-certificates-designate.yaml (+2/-0)
overlays/vault-openstack-certificates-heat.yaml (+2/-0)
overlays/vault-openstack-certificates-octavia.yaml (+2/-0)
overlays/vault-openstack-certificates.yaml (+6/-0)
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Jolly Bundlers Pending
Review via email: mp+379622@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

LGTM

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 5bdba69..873eb3b 100644
3--- a/openstack/pipeline/02configure
4+++ b/openstack/pipeline/02configure
5@@ -443,7 +443,13 @@ do
6 --vault)
7 assert_min_release queens "vault"
8 MOD_OVERLAYS+=( "vault.yaml" )
9- MOD_OVERLAYS+=( "vault-openstack.yaml" )
10+ MOD_OVERLAYS+=( "vault-openstack-secrets.yaml" )
11+ if ! has_opt --ssl; then
12+ MOD_OVERLAYS+=( "vault-openstack-certificates.yaml" )
13+ for opt in --heat --octavia --barbican --designate; do
14+ has_opt $opt && MOD_OVERLAYS+=( "vault-openstack-certificates-${opt##--}.yaml" )
15+ done
16+ fi
17 has_opt --ceph && MOD_OVERLAYS+=( "vault-ceph.yaml" )
18 ;;
19 --etcd-channel) #__OPT__type:<str>
20diff --git a/overlays/vault-openstack-certificates-barbican.yaml b/overlays/vault-openstack-certificates-barbican.yaml
21new file mode 100644
22index 0000000..d3741ab
23--- /dev/null
24+++ b/overlays/vault-openstack-certificates-barbican.yaml
25@@ -0,0 +1,2 @@
26+relations:
27+ - ['barbican:certificates', 'vault:certificates']
28diff --git a/overlays/vault-openstack-certificates-designate.yaml b/overlays/vault-openstack-certificates-designate.yaml
29new file mode 100644
30index 0000000..9816c37
31--- /dev/null
32+++ b/overlays/vault-openstack-certificates-designate.yaml
33@@ -0,0 +1,2 @@
34+relations:
35+ - ['designate:certificates', 'vault:certificates']
36diff --git a/overlays/vault-openstack-certificates-heat.yaml b/overlays/vault-openstack-certificates-heat.yaml
37new file mode 100644
38index 0000000..a065dfc
39--- /dev/null
40+++ b/overlays/vault-openstack-certificates-heat.yaml
41@@ -0,0 +1,2 @@
42+relations:
43+ - ['heat:certificates', 'vault:certificates']
44diff --git a/overlays/vault-openstack-certificates-octavia.yaml b/overlays/vault-openstack-certificates-octavia.yaml
45new file mode 100644
46index 0000000..eb860b5
47--- /dev/null
48+++ b/overlays/vault-openstack-certificates-octavia.yaml
49@@ -0,0 +1,2 @@
50+relations:
51+ - ['octavia:certificates', 'vault:certificates']
52diff --git a/overlays/vault-openstack-certificates.yaml b/overlays/vault-openstack-certificates.yaml
53new file mode 100644
54index 0000000..78d1e0f
55--- /dev/null
56+++ b/overlays/vault-openstack-certificates.yaml
57@@ -0,0 +1,6 @@
58+relations:
59+ - ['cinder:certificates', 'vault:certificates']
60+ - ['glance:certificates', 'vault:certificates']
61+ - ['keystone:certificates', 'vault:certificates']
62+ - ['neutron-api:certificates', 'vault:certificates']
63+ - ['nova-cloud-controller:certificates', 'vault:certificates']
64diff --git a/overlays/vault-openstack.yaml b/overlays/vault-openstack-secrets.yaml
65similarity index 100%
66rename from overlays/vault-openstack.yaml
67rename to overlays/vault-openstack-secrets.yaml

Subscribers

People subscribed via source and target branches