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

[Edward Hope-Morley]

[Ponnuvel Palaniyappan (pponnuvel)]

Tested it and it works now. Thanks.

review: Approve

diff --git a/openstack/module_defaults b/openstack/module_defaults
index 79f0cf7..c7ece87 100644
--- a/openstack/module_defaults
+++ b/openstack/module_defaults
@@ -20,6 +20,7 @@ MOD_PARAMS[__NUM_HEAT_UNITS__]=1
 MOD_PARAMS[__NUM_HORIZON_UNITS__]=1
 MOD_PARAMS[__NUM_KEYSTONE_UNITS__]=1
 MOD_PARAMS[__NUM_MYSQL_UNITS__]=1
+MOD_PARAMS[__NUM_MYSQL_INNODB_UNITS__]=3  # absolute min required
 MOD_PARAMS[__NUM_NEUTRON_API_UNITS__]=1
 MOD_PARAMS[__NUM_NOVACC_UNITS__]=1
 MOD_PARAMS[__NUM_RABBIT_UNITS__]=1
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index 96a3ab0..1faaf36 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -254,7 +254,7 @@ do
             conflicts_with $1 --mysql-ha*
             assert_min_release train mysql-innodb-cluster
             # NOTE: 3 is actually the absolute minimum units required
-            get_units $1 __NUM_MYSQL_UNITS__ 3
+            get_units $1 __NUM_MYSQL_INNODB_UNITS__ 3
             MOD_OVERLAYS+=( "mysql-innodb-cluster.yaml")
             ;;
         --no-ml2dns)  #__OPT__
diff --git a/overlays/mysql-innodb-cluster.yaml b/overlays/mysql-innodb-cluster.yaml
index fd75c92..8fb498b 100644
--- a/overlays/mysql-innodb-cluster.yaml
+++ b/overlays/mysql-innodb-cluster.yaml
@@ -5,7 +5,7 @@ applications:
   mysql:  # we call it 'mysql' since that's how other applications address this one.
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
     constraints: mem=4G
-    num_units: __NUM_MYSQL_UNITS__
+    num_units: __NUM_MYSQL_INNODB_UNITS__
     options:
       source: *source
       innodb-buffer-pool-size: 50%