stsstack-bundles

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

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. bug/1896808
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 2da1abf99829f9096d0595e7e8f596822d85c09b
Proposed branch: ~hopem/stsstack-bundles:bug/1896808
Merge into: stsstack-bundles:master
Diff against target: 38 lines (+3/-2)
3 files modified
openstack/module_defaults (+1/-0)
openstack/pipeline/02configure (+1/-1)
overlays/mysql-innodb-cluster.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Ponnuvel Palaniyappan (community) Approve
Jolly Bundlers Pending
Review via email: mp+391278@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ponnuvel Palaniyappan (pponnuvel) wrote :

Tested it and it works now. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/module_defaults b/openstack/module_defaults
2index 79f0cf7..c7ece87 100644
3--- a/openstack/module_defaults
4+++ b/openstack/module_defaults
5@@ -20,6 +20,7 @@ MOD_PARAMS[__NUM_HEAT_UNITS__]=1
6 MOD_PARAMS[__NUM_HORIZON_UNITS__]=1
7 MOD_PARAMS[__NUM_KEYSTONE_UNITS__]=1
8 MOD_PARAMS[__NUM_MYSQL_UNITS__]=1
9+MOD_PARAMS[__NUM_MYSQL_INNODB_UNITS__]=3 # absolute min required
10 MOD_PARAMS[__NUM_NEUTRON_API_UNITS__]=1
11 MOD_PARAMS[__NUM_NOVACC_UNITS__]=1
12 MOD_PARAMS[__NUM_RABBIT_UNITS__]=1
13diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
14index 96a3ab0..1faaf36 100644
15--- a/openstack/pipeline/02configure
16+++ b/openstack/pipeline/02configure
17@@ -254,7 +254,7 @@ do
18 conflicts_with $1 --mysql-ha*
19 assert_min_release train mysql-innodb-cluster
20 # NOTE: 3 is actually the absolute minimum units required
21- get_units $1 __NUM_MYSQL_UNITS__ 3
22+ get_units $1 __NUM_MYSQL_INNODB_UNITS__ 3
23 MOD_OVERLAYS+=( "mysql-innodb-cluster.yaml")
24 ;;
25 --no-ml2dns) #__OPT__
26diff --git a/overlays/mysql-innodb-cluster.yaml b/overlays/mysql-innodb-cluster.yaml
27index fd75c92..8fb498b 100644
28--- a/overlays/mysql-innodb-cluster.yaml
29+++ b/overlays/mysql-innodb-cluster.yaml
30@@ -5,7 +5,7 @@ applications:
31 mysql: # we call it 'mysql' since that's how other applications address this one.
32 charm: cs:~openstack-charmers-next/mysql-innodb-cluster
33 constraints: mem=4G
34- num_units: __NUM_MYSQL_UNITS__
35+ num_units: __NUM_MYSQL_INNODB_UNITS__
36 options:
37 source: *source
38 innodb-buffer-pool-size: 50%

Subscribers

People subscribed via source and target branches