stsstack-bundles

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

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. bug/1892002
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: ec179744938c47f0c7270ea33f875b2280e86992
Proposed branch: ~hopem/stsstack-bundles:bug/1892002
Merge into: stsstack-bundles:master
Diff against target: 22 lines (+5/-0)
2 files modified
openstack/pipeline/02configure (+3/-0)
overlays/vault-certificates-mysql-innodb-cluster.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Jolly Bundlers Pending
Review via email: mp+392734@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 42b512b..213c788 100644
3--- a/openstack/pipeline/02configure
4+++ b/openstack/pipeline/02configure
5@@ -279,6 +279,9 @@ do
6 # NOTE: 3 is actually the absolute minimum units required
7 get_units $1 __NUM_MYSQL_UNITS__ 3
8 MOD_OVERLAYS+=( "mysql-innodb-cluster.yaml")
9+ if has_opt --vault; then
10+ MOD_OVERLAYS+=( "vault-certificates-mysql-innodb-cluster.yaml" )
11+ fi
12 ;;
13 --no-ml2dns) #__OPT__
14 conflicts_with $1 --ml2dns
15diff --git a/overlays/vault-certificates-mysql-innodb-cluster.yaml b/overlays/vault-certificates-mysql-innodb-cluster.yaml
16new file mode 100644
17index 0000000..ae15bee
18--- /dev/null
19+++ b/overlays/vault-certificates-mysql-innodb-cluster.yaml
20@@ -0,0 +1,2 @@
21+relations:
22+ - ['mysql-innodb-cluster:certificates', 'vault:certificates']

Subscribers

People subscribed via source and target branches