Merge ~hopem/stsstack-bundles:reorganise-module-defaults into stsstack-bundles:master

[Edward Hope-Morley]

[Hemanth Nakkina (hemanth-n)]

LGTM, verified few scenarios

review: Approve

diff --git a/.module_defaults/ceph b/.module_defaults/ceph
new file mode 120000
index 0000000..faf6404
--- /dev/null
+++ b/.module_defaults/ceph
@@ -0,0 +1 @@
+../ceph/module_defaults
\ No newline at end of file
diff --git a/.module_defaults/kubernetes b/.module_defaults/kubernetes
new file mode 120000
index 0000000..1737714
--- /dev/null
+++ b/.module_defaults/kubernetes
@@ -0,0 +1 @@
+../kubernetes/module_defaults
\ No newline at end of file
diff --git a/.module_defaults/landscape b/.module_defaults/landscape
new file mode 120000
index 0000000..ccafb1a
--- /dev/null
+++ b/.module_defaults/landscape
@@ -0,0 +1 @@
+../landscape/module_defaults
\ No newline at end of file
diff --git a/.module_defaults/openstack b/.module_defaults/openstack
new file mode 120000
index 0000000..196dd1a
--- /dev/null
+++ b/.module_defaults/openstack
@@ -0,0 +1 @@
+../openstack/module_defaults
\ No newline at end of file
diff --git a/.module_defaults/swift b/.module_defaults/swift
new file mode 120000
index 0000000..ead6d4a
--- /dev/null
+++ b/.module_defaults/swift
@@ -0,0 +1 @@
+../swift/module_defaults
\ No newline at end of file
diff --git a/ceph/module_defaults b/ceph/module_defaults
new file mode 100644
index 0000000..c3715ad
--- /dev/null
+++ b/ceph/module_defaults
@@ -0,0 +1,16 @@
+# This file must contain defaults for all variables used in bundles/ovelays.
+# They are used to render to final product in the event they are not provided
+# elsewhere. It is inserted into the global context at the start of the
+# pipeline.
+#
+# You can check that none are missing by running lint/check_var_defaults.sh
+#
+MOD_PARAMS[__OS_ORIGIN__]=$os_origin
+MOD_PARAMS[__SOURCE__]=$source
+MOD_PARAMS[__NUM_CEPH_MON_UNITS__]=1
+MOD_PARAMS[__NUM_CEPH_FS_UNITS__]=1
+MOD_PARAMS[__CEPH_INTERFACE__]='ceph-mon'
+MOD_PARAMS[__SSL_CA__]=
+MOD_PARAMS[__SSL_CERT__]=
+MOD_PARAMS[__SSL_KEY__]=
+MOD_PARAMS[__NUM_CEPH_RGW_UNITS__]=1
diff --git a/ceph/pipeline/01setup b/ceph/pipeline/00setup
similarity index 100%
rename from ceph/pipeline/01setup
rename to ceph/pipeline/00setup
diff --git a/ceph/pipeline/01import-config-defaults b/ceph/pipeline/01import-config-defaults
new file mode 100644
index 0000000..be9c1f7
--- /dev/null
+++ b/ceph/pipeline/01import-config-defaults
@@ -0,0 +1,6 @@
+# Start with dependency defaults in case we want to override any locally
+. ../.module_defaults/openstack
+. ../.module_defaults/kubernetes  # needed for etcd, easyrsa etc
+
+# Current module imports
+. module_defaults 
diff --git a/ceph/pipeline/02configure b/ceph/pipeline/02configure
index 514203e..88c63d2 100644
--- a/ceph/pipeline/02configure
+++ b/ceph/pipeline/02configure
@@ -1,18 +1,10 @@
-#!/bin/bash
-# Bundle template parameters. These should correspond to variables set at the top
-# of yaml bundle and overlay templates.
-MOD_PARAMS[__OS_ORIGIN__]=$os_origin
-MOD_PARAMS[__SOURCE__]=$source
-MOD_PARAMS[__NUM_CEPH_MON_UNITS__]=1
-MOD_PARAMS[__CEPH_INTERFACE__]='ceph-mon'
-MOD_PARAMS[__NUM_VAULT_UNITS__]=1  # there are > 1 vault* overlay so need to use a global with default
-MOD_PARAMS[__SSL_CA__]=
-MOD_PARAMS[__SSL_CERT__]=
-MOD_PARAMS[__SSL_KEY__]=
-MOD_PARAMS[__NUM_ETCD_UNITS__]=1
-MOD_PARAMS[__ETCD_SNAP_CHANNEL__]='latest/stable'
-MOD_PARAMS[__GRAYLOG_SNAP_CHANNEL__]='3/stable'
-MOD_PARAMS[__GRAFANA_SNAP_CHANNEL__]='stable'
+#!/bin/bash -eu
+# Global variables are first defined in 00setup and module
+# dependencies are defined in 01import-config-defaults
+#
+# All overlay/bundle variables (MOD_PARAMS) defaults must go into
+# the <module>/module_defaults file.
+
 
 # Skip processing input if it includes exclusive passthrough options
 ! has_excl_passthrough_opt && \
diff --git a/common/generate-bundle.sh b/common/generate-bundle.sh
index 7c5e8e2..56bb41d 100755
--- a/common/generate-bundle.sh
+++ b/common/generate-bundle.sh
@@ -1,6 +1,11 @@
 #!/bin/bash -eu
 LIB_COMMON=`dirname $0`/common
 . $LIB_COMMON/helpers
-. pipeline/01setup
+. pipeline/00setup
+. pipeline/01import-config-defaults
 . pipeline/02configure
 . pipeline/03build
+# Ensure no unrendered variables
+out="`grep -r __ b/${MASTER_OPTS[BUNDLE_NAME]} --exclude=config`"
+[ -n "$out" ] || exit
+echo -e "ERROR: there are unrendered variables in your bundle:\n$out"
diff --git a/kubernetes/module_defaults b/kubernetes/module_defaults
new file mode 100644
index 0000000..7988f30
--- /dev/null
+++ b/kubernetes/module_defaults
@@ -0,0 +1,23 @@
+# This file must contain defaults for all variables used in bundles/ovelays.
+# They are used to render to final product in the event they are not provided
+# elsewhere. It is inserted into the global context at the start of the
+# pipeline.
+#
+# You can check that none are missing by running lint/check_var_defaults.sh
+#
+MOD_PARAMS[__K8S_CHANNEL__]="latest/stable"
+MOD_PARAMS[__NUM_ETCD_UNITS__]=1
+MOD_PARAMS[__NUM_K8S_MASTER_UNITS__]=1
+MOD_PARAMS[__NUM_K8S_WORKER_UNITS__]=2
+MOD_PARAMS[__NUM_K8S_LB_UNITS__]=1
+MOD_PARAMS[__ETCD_SNAP_CHANNEL__]='latest/stable'
+MOD_PARAMS[__CHARM_CHANNEL__]=
+
+# NOTE: the k8s charms publish to stable and edge so its fine to default to
+#       edge but other charms e.g. openstack charms like ceph-mon do not so if
+#       they are used we must override and use stable.
+if ! has_opt --charm-channel && \
+        ! has_opt --use-stable-charms; then
+    MOD_PARAMS[__CHARM_CHANNEL__]=edge
+fi
+
diff --git a/kubernetes/pipeline/01setup b/kubernetes/pipeline/00setup
similarity index 100%
rename from kubernetes/pipeline/01setup
rename to kubernetes/pipeline/00setup
diff --git a/kubernetes/pipeline/01import-config-defaults b/kubernetes/pipeline/01import-config-defaults
new file mode 100644
index 0000000..e91dc0a
--- /dev/null
+++ b/kubernetes/pipeline/01import-config-defaults
@@ -0,0 +1,6 @@
+# Start with dependency defaults in case we want to override any locally
+. ../.module_defaults/openstack  # needed for vault
+. ../.module_defaults/ceph
+
+# Current module imports
+. module_defaults 
diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
index 5468f9e..38f8d21 100644
--- a/kubernetes/pipeline/02configure
+++ b/kubernetes/pipeline/02configure
@@ -1,26 +1,10 @@
 #!/bin/bash -eu
-# NOTE: global variables must be first defined in 01setup
+# Global variables are first defined in 00setup and module
+# dependencies are defined in 01import-config-defaults
+#
+# All overlay/bundle variables (MOD_PARAMS) defaults must go into
+# the <module>/module_defaults file.
 
-# Bundle template MOD_PARAMS. These should correspond to variables set at the top
-# of yaml bundle and overlay templates.
-MOD_PARAMS[__NUM_CEPH_MON_UNITS__]=1
-MOD_PARAMS[__CEPH_INTERFACE__]='ceph-mon'
-MOD_PARAMS[__K8S_CHANNEL__]="latest/stable"
-MOD_PARAMS[__NUM_ETCD_UNITS__]=1
-MOD_PARAMS[__NUM_K8S_MASTER_UNITS__]=1
-MOD_PARAMS[__NUM_K8S_WORKER_UNITS__]=2
-MOD_PARAMS[__NUM_VAULT_UNITS__]=1  # there are > 1 vault* overlay so need to use a global with default
-MOD_PARAMS[__NUM_K8S_LB_UNITS__]=1
-MOD_PARAMS[__ETCD_SNAP_CHANNEL__]='latest/stable'
-MOD_PARAMS[__CHARM_CHANNEL__]=
-
-# NOTE: the k8s charms publish to stable and edge so its fine to default to
-#       edge but other charms e.g. openstack charms like ceph-mon do not so if
-#       they are used we must override and use stable.
-if ! has_opt --charm-channel && \
-        ! has_opt --use-stable-charms; then
-    MOD_PARAMS[__CHARM_CHANNEL__]=edge
-fi
 
 # default for current stable is to use containerd
 # See https://ubuntu.com/kubernetes/docs/container-runtime
diff --git a/landscape/module_defaults b/landscape/module_defaults
new file mode 100644
index 0000000..4606ee6
--- /dev/null
+++ b/landscape/module_defaults
@@ -0,0 +1,8 @@
+# This file must contain defaults for all variables used in bundles/ovelays.
+# They are used to render to final product in the event they are not provided
+# elsewhere. It is inserted into the global context at the start of the
+# pipeline.
+#
+# You can check that none are missing by running lint/check_var_defaults.sh
+#
+MOD_PARAMS[__LANDSCAPE_VERSION__]="19.01"
diff --git a/landscape/pipeline/01setup b/landscape/pipeline/00setup
similarity index 100%
rename from landscape/pipeline/01setup
rename to landscape/pipeline/00setup
diff --git a/landscape/pipeline/01import-config-defaults b/landscape/pipeline/01import-config-defaults
new file mode 100644
index 0000000..d7def10
--- /dev/null
+++ b/landscape/pipeline/01import-config-defaults
@@ -0,0 +1,4 @@
+# Start with dependency defaults in case we want to override any locally
+
+# Current module imports
+. module_defaults 
diff --git a/landscape/pipeline/02configure b/landscape/pipeline/02configure
index dd7b9aa..27d8fe2 100644
--- a/landscape/pipeline/02configure
+++ b/landscape/pipeline/02configure
@@ -1,7 +1,10 @@
-#!/bin/bash
-# NOTE: global variables must be first defined in 01setup
+#!/bin/bash -eu
+# Global variables are first defined in 00setup and module
+# dependencies are defined in 01import-config-defaults
+#
+# All overlay/bundle variables (MOD_PARAMS) defaults must go into
+# the <module>/module_defaults file.
 
-MOD_PARAMS[__LANDSCAPE_VERSION__]="19.01"
 
 # Skip processing input if it includes exclusive passthrough options
 ! has_excl_passthrough_opt && \
diff --git a/lint/check_var_defaults.sh b/lint/check_var_defaults.sh
new file mode 100755
index 0000000..bae4ed6
--- /dev/null
+++ b/lint/check_var_defaults.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+# Get all non-special variables from existing overlays and bundles
+readarray -t vars<<<"`egrep -r ':.+__' overlays| egrep -v '__RESOURCES_PATH__|__SSL_|__VIP__|__SOURCE__|__OS_ORIGIN__'| sed -r 's/.+(__.+__).*/\1/g'| sort -u`"
+# Get all module defaults
+readarray -t mod_defaults<<<"`find .module_defaults -type l`"
+echo "Checking ${#vars[@]} vars..."
+for var in ${vars[@]}; do
+    found=false
+    for defs in ${mod_defaults[@]}; do
+        egrep -q "^MOD_PARAMS\[$var\]" $defs && found=true
+    done
+    $found || echo "$var has no default"
+done
+echo "Done."
diff --git a/openstack/module_defaults b/openstack/module_defaults
new file mode 100644
index 0000000..9f15c37
--- /dev/null
+++ b/openstack/module_defaults
@@ -0,0 +1,49 @@
+# This file must contain defaults for all variables used in bundles/ovelays.
+# They are used to render to final product in the event they are not provided
+# elsewhere. It is inserted into the global context at the start of the
+# pipeline.
+#
+# You can check that none are missing by running lint/check_var_defaults.sh
+#
+MOD_PARAMS[__OS_ORIGIN__]=$os_origin
+MOD_PARAMS[__SOURCE__]=$source
+MOD_PARAMS[__NUM_BARBICAN_UNITS__]=1
+MOD_PARAMS[__NUM_COMPUTE_UNITS__]=1
+MOD_PARAMS[__NUM_NEUTRON_GATEWAY_UNITS__]=1
+MOD_PARAMS[__NUM_AGENTS_PER_ROUTER__]=3
+MOD_PARAMS[__NUM_VAULT_UNITS__]=1  # there are > 1 vault* overlay so need to use a global with default
+MOD_PARAMS[__NUM_OCTAVIA_UNITS__]=1
+MOD_PARAMS[__NUM_CINDER_UNITS__]=1
+MOD_PARAMS[__NUM_DESIGNATE_UNITS__]=1
+MOD_PARAMS[__NUM_GLANCE_UNITS__]=1
+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_NEUTRON_API_UNITS__]=1
+MOD_PARAMS[__NUM_NOVACC_UNITS__]=1
+MOD_PARAMS[__NUM_RABBIT_UNITS__]=1
+MOD_PARAMS[__NUM_TELEMETRY_UNITS__]=1
+MOD_PARAMS[__NEUTRON_FW_DRIVER__]=openvswitch  # legacy is iptables_hybrid
+MOD_PARAMS[__SSL_CA__]=
+MOD_PARAMS[__SSL_CERT__]=
+MOD_PARAMS[__SSL_KEY__]=
+MOD_PARAMS[__DVR_DATA_PORT__]=''
+MOD_PARAMS[__OVN_DATA_PORT__]=''
+MOD_PARAMS[__BIND_DNS_FORWARDER__]=`get_local_upstream_dns`
+MOD_PARAMS[__ML2_DNS_FORWARDER__]=`get_local_upstream_dns`
+MOD_PARAMS[__GRAYLOG_SNAP_CHANNEL__]='3/stable'
+MOD_PARAMS[__GRAFANA_SNAP_CHANNEL__]='stable'
+MOD_PARAMS[__OCTAVIA_RETROFIT_UCA__]='rocky'  # charm defaults to rocky since it's the first version supported
+MOD_PARAMS[__AMPHORA_SSH_PUB_KEY__]=''
+MOD_PARAMS[__GSSS_SWIFT_ENABLED__]=false  # glance-simplestreams-sync can optionally store index data in swift
+MOD_PARAMS[__LDAP_SERVER__]=''
+MOD_PARAMS[__OVERLAY_NETWORK_TYPE__]='gre'  # this is the charm default
+
+# Try to use current model (or newly requested one) as subdomain name
+model_subdomain=`get_juju_model`
+[ -n "$model_subdomain" ] || model_subdomain="overcloud"
+MOD_PARAMS[__DNS_DOMAIN__]="${model_subdomain}.stsstack.qa.1ss."
+MOD_PARAMS[__DESIGNATE_NAMESERVERS__]="ns1.${MOD_PARAMS[__DNS_DOMAIN__]}"
+
+MOD_PARAMS[__CONSOLE_TYPE__]="novnc"
diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
index 3307488..35b1de1 100644
--- a/openstack/openstack.yaml.template
+++ b/openstack/openstack.yaml.template
@@ -10,7 +10,6 @@ debug:                      &debug                     True
 verbose:                    &verbose                   True
 openstack_origin:           &openstack_origin          __OS_ORIGIN__
 source:                     &source                    __SOURCE__
-num_compute_units:          &num_compute_units         __NUM_COMPUTE_UNITS__
 
 ssl_ca:                     &ssl_ca                    __SSL_CA__
 ssl_cert:                   &ssl_cert                  __SSL_CERT__
@@ -19,13 +18,14 @@ ssl_key:                    &ssl_key                   __SSL_KEY__
 series: __SERIES__
 applications:
   rabbitmq-server:
-    num_units: 1
+    num_units: __NUM_RABBIT_UNITS__
     charm: cs:~openstack-charmers-next/rabbitmq-server
     constraints: mem=1G
     options:
       source: *source
+      min-cluster-size: __NUM_RABBIT_UNITS__
   keystone:
-    num_units: 1
+    num_units: __NUM_KEYSTONE_UNITS__
     charm: cs:~openstack-charmers-next/keystone
     constraints: mem=1G
     options:
@@ -39,7 +39,7 @@ applications:
       ssl_key: *ssl_key
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
-    num_units: *num_compute_units
+    num_units: __NUM_COMPUTE_UNITS__
     constraints: mem=4G
     options:
       debug: *debug
@@ -50,7 +50,7 @@ applications:
       openstack-origin: *openstack_origin
       force-raw-images: false  # disable for stsstack since conversion kills the disks and is not needed
   nova-cloud-controller:
-    num_units: 1
+    num_units: __NUM_NOVACC_UNITS__
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     constraints: mem=2G
     options:
@@ -62,7 +62,7 @@ applications:
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
   neutron-api:
-    num_units: 1
+    num_units: __NUM_NEUTRON_API_UNITS__
     charm: cs:~openstack-charmers-next/neutron-api
     constraints: mem=1G
     options:
@@ -77,7 +77,7 @@ applications:
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
   cinder:
-    num_units: 1
+    num_units: __NUM_CINDER_UNITS__
     constraints: mem=2G
     charm: cs:~openstack-charmers-next/cinder
     options:
@@ -92,7 +92,7 @@ applications:
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
   glance:
-    num_units: 1
+    num_units: __NUM_GLANCE_UNITS__
     charm: cs:~openstack-charmers-next/glance
     constraints: mem=1G
     options:
diff --git a/openstack/pipeline/01setup b/openstack/pipeline/00setup
similarity index 100%
rename from openstack/pipeline/01setup
rename to openstack/pipeline/00setup
diff --git a/openstack/pipeline/01import-config-defaults b/openstack/pipeline/01import-config-defaults
new file mode 100644
index 0000000..e49ecc4
--- /dev/null
+++ b/openstack/pipeline/01import-config-defaults
@@ -0,0 +1,7 @@
+# Start with dependency defaults in case we want to override any locally
+. ../.module_defaults/ceph
+. ../.module_defaults/swift
+. ../.module_defaults/kubernetes  # needed for etcd, easyrsa etc
+
+# Current module imports
+. module_defaults 
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index 478b3b1..1e2e3ff 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -1,46 +1,13 @@
-#!/bin/bash
-# NOTE: global variables must be first defined in 01setup
+#!/bin/bash -eu
+# Global variables are first defined in 00setup and module
+# dependencies are defined in 01import-config-defaults
+#
+# All overlay/bundle variables (MOD_PARAMS) defaults must go into
+# the <module>/module_defaults file.
 
-# Bundle template MOD_PARAMS. These should correspond to variables set at the top
-# of yaml bundle and overlay templates.
-MOD_PARAMS[__OS_ORIGIN__]=$os_origin
-MOD_PARAMS[__SOURCE__]=$source
-MOD_PARAMS[__NUM_BARBICAN_UNITS__]=1
-MOD_PARAMS[__NUM_COMPUTE_UNITS__]=1
-MOD_PARAMS[__NUM_CEPH_MON_UNITS__]=1
-MOD_PARAMS[__NUM_CEPH_FS_UNITS__]=1
-MOD_PARAMS[__CEPH_INTERFACE__]='ceph-mon'
-MOD_PARAMS[__NUM_NEUTRON_GATEWAY_UNITS__]=1
-MOD_PARAMS[__NUM_VAULT_UNITS__]=1  # there are > 1 vault* overlay so need to use a global with default
-MOD_PARAMS[__NUM_ETCD_UNITS__]=1
-MOD_PARAMS[__NUM_OCTAVIA_UNITS__]=1
-MOD_PARAMS[__NEUTRON_FW_DRIVER__]=openvswitch  # legacy is iptables_hybrid
-MOD_PARAMS[__SSL_CA__]=
-MOD_PARAMS[__SSL_CERT__]=
-MOD_PARAMS[__SSL_KEY__]=
-MOD_PARAMS[__DVR_DATA_PORT__]=''
-MOD_PARAMS[__OVN_DATA_PORT__]=''
-MOD_PARAMS[__BIND_DNS_FORWARDER__]=`get_local_upstream_dns`
-MOD_PARAMS[__ML2_DNS_FORWARDER__]=`get_local_upstream_dns`
-MOD_PARAMS[__ETCD_SNAP_CHANNEL__]='latest/stable'
-MOD_PARAMS[__GRAYLOG_SNAP_CHANNEL__]='3/stable'
-MOD_PARAMS[__GRAFANA_SNAP_CHANNEL__]='stable'
-MOD_PARAMS[__OCTAVIA_RETROFIT_UCA__]='rocky'  # charm defaults to rocky since it's the first version supported
-MOD_PARAMS[__AMPHORA_SSH_PUB_KEY__]=''
-MOD_PARAMS[__GSSS_SWIFT_ENABLED__]=false  # glance-simplestreams-sync can optionally store index data in swift
-MOD_PARAMS[__LDAP_SERVER__]=''
-MOD_PARAMS[__OVERLAY_NETWORK_TYPE__]='gre'  # this is the charm default
 
-# Try to use current model (or newly requested one) as subdomain name
-model_subdomain=`get_juju_model`
-[ -n "$model_subdomain" ] || model_subdomain="overcloud"
-MOD_PARAMS[__DNS_DOMAIN__]="${model_subdomain}.stsstack.qa.1ss."
-MOD_PARAMS[__DESIGNATE_NAMESERVERS__]="ns1.${MOD_PARAMS[__DNS_DOMAIN__]}"
-
-MOD_PARAMS[__CONSOLE_TYPE__]="novnc"
 # If using any variant of dvr-snat, there is no need for a neutron-gateway.
 # We also don't currently need it when using ovn
-
 is_neutron_gateway_required ()
 {
     if ! has_opt --dvr-snat* && ! has_opt --ovn; then
@@ -331,7 +298,6 @@ do
             ;;
         --rabbitmq-server-ha*)
             get_units $1 __NUM_RABBIT_UNITS__ 3
-            MOD_OVERLAYS+=( "rabbitmq-server-ha.yaml" )
             ;;
         --rsyslog)
             MOD_OVERLAYS+=( "rsyslog.yaml" )
diff --git a/overlays/ceph-rgw-ha.yaml b/overlays/ceph-rgw-ha.yaml
index f7abb5b..d3050fc 100644
--- a/overlays/ceph-rgw-ha.yaml
+++ b/overlays/ceph-rgw-ha.yaml
@@ -1,11 +1,9 @@
 applications:
   ceph-rgw:
-    num_units: __NUM_CEPH_RGW_UNITS__
     options:
       vip: __VIP__
   ceph-rgw-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
     options:
       cluster_count: __NUM_CEPH_RGW_UNITS__
 relations:
diff --git a/overlays/ceph-rgw.yaml b/overlays/ceph-rgw.yaml
index f75f23f..ba83bb1 100644
--- a/overlays/ceph-rgw.yaml
+++ b/overlays/ceph-rgw.yaml
@@ -11,7 +11,7 @@ ssl_key:                    &ssl_key                   __SSL_KEY__
 applications:
   ceph-rgw:
     charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
+    num_units: __NUM_CEPH_RGW_UNITS__
     constraints: mem=1G
     options:
       loglevel: *loglevel
diff --git a/overlays/cinder-ha.yaml b/overlays/cinder-ha.yaml
index f7e45f9..815bba9 100644
--- a/overlays/cinder-ha.yaml
+++ b/overlays/cinder-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   cinder:
-    num_units: __NUM_CINDER_UNITS__
     options:
       vip: __VIP__
   cinder-hacluster:
diff --git a/overlays/designate-ha.yaml b/overlays/designate-ha.yaml
index 29bb022..bd9bcb2 100644
--- a/overlays/designate-ha.yaml
+++ b/overlays/designate-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   designate:
-    num_units: __NUM_DESIGNATE_UNITS__
     options:
       vip: __VIP__
   designate-bind:
diff --git a/overlays/designate.yaml b/overlays/designate.yaml
index c90b26d..85603d3 100644
--- a/overlays/designate.yaml
+++ b/overlays/designate.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   designate:
     charm: cs:~openstack-charmers-next/designate
-    num_units: 1
+    num_units: __NUM_DESIGNATE_UNITS__
     constraints: mem=2G
     options:
       debug: *debug
diff --git a/overlays/glance-ha.yaml b/overlays/glance-ha.yaml
index 00992f5..cc4ebd4 100644
--- a/overlays/glance-ha.yaml
+++ b/overlays/glance-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   glance:
-    num_units: __NUM_GLANCE_UNITS__
     options:
       vip: __VIP__
   glance-hacluster:
diff --git a/overlays/gnocchi.yaml b/overlays/gnocchi.yaml
index 6fa5768..1c67a1f 100644
--- a/overlays/gnocchi.yaml
+++ b/overlays/gnocchi.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   gnocchi:
     charm: cs:~openstack-charmers-next/gnocchi
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/overlays/heat-ha.yaml b/overlays/heat-ha.yaml
index e0531fa..d811c3f 100644
--- a/overlays/heat-ha.yaml
+++ b/overlays/heat-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   heat:
-    num_units: __NUM_HEAT_UNITS__
     options:
       vip: __VIP__
   heat-hacluster:
diff --git a/overlays/heat.yaml b/overlays/heat.yaml
index c051270..272aa93 100644
--- a/overlays/heat.yaml
+++ b/overlays/heat.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   heat:
     charm: cs:~openstack-charmers-next/heat
-    num_units: 1
+    num_units: __NUM_HEAT_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/overlays/keystone-ha.yaml b/overlays/keystone-ha.yaml
index 8d96054..0154a5d 100644
--- a/overlays/keystone-ha.yaml
+++ b/overlays/keystone-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   keystone:
-    num_units: __NUM_KEYSTONE_UNITS__
     options:
       vip: __VIP__
   keystone-hacluster:
diff --git a/overlays/mysql-ha.yaml b/overlays/mysql-ha.yaml
index 9e3fe79..6d86999 100644
--- a/overlays/mysql-ha.yaml
+++ b/overlays/mysql-ha.yaml
@@ -1,9 +1,7 @@
 applications:
   mysql:
-    num_units: __NUM_MYSQL_UNITS__
     options:
       vip: __VIP__
-      min-cluster-size: __NUM_MYSQL_UNITS__
   mysql-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     options:
diff --git a/overlays/mysql.yaml b/overlays/mysql.yaml
index b416801..30ad271 100644
--- a/overlays/mysql.yaml
+++ b/overlays/mysql.yaml
@@ -3,7 +3,7 @@ source:                     &source          __OS_ORIGIN__
 
 applications:
   mysql:
-    num_units: 1
+    num_units: __NUM_MYSQL_UNITS__
     charm: cs:~openstack-charmers-next/percona-cluster
     constraints: mem=4G
     options:
@@ -12,3 +12,4 @@ applications:
       max-connections: 20000
       root-password: ChangeMe123
       sst-password: ChangeMe123
+      min-cluster-size: __NUM_MYSQL_UNITS__
diff --git a/overlays/neutron-api-ha.yaml b/overlays/neutron-api-ha.yaml
index d6daa3f..77f5b21 100644
--- a/overlays/neutron-api-ha.yaml
+++ b/overlays/neutron-api-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   neutron-api:
-    num_units: __NUM_NEUTRON_API_UNITS__
     options:
       vip: __VIP__
   neutron-api-hacluster:
diff --git a/overlays/nova-cloud-controller-ha.yaml b/overlays/nova-cloud-controller-ha.yaml
index 1aa0025..e40343b 100644
--- a/overlays/nova-cloud-controller-ha.yaml
+++ b/overlays/nova-cloud-controller-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   nova-cloud-controller:
-    num_units: __NUM_NOVACC_UNITS__
     options:
       vip: __VIP__
   nova-cloud-controller-hacluster:
diff --git a/overlays/octavia-dashboard.yaml b/overlays/octavia-dashboard.yaml
index e882f5c..3102c06 100644
--- a/overlays/octavia-dashboard.yaml
+++ b/overlays/octavia-dashboard.yaml
@@ -3,5 +3,6 @@
 applications:
   octavia-dashboard:
     charm: cs:~openstack-charmers-next/octavia-dashboard
+    num_units: __NUM_HORIZON_UNITS__
 relations:
   - [ octavia-dashboard:dashboard, openstack-dashboard:dashboard-plugin ]
diff --git a/overlays/octavia-ha.yaml b/overlays/octavia-ha.yaml
index 190e624..f54edb1 100644
--- a/overlays/octavia-ha.yaml
+++ b/overlays/octavia-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   octavia:
-    num_units: __NUM_OCTAVIA_UNITS__
     options:
       vip: __VIP__
   octavia-hacluster:
diff --git a/overlays/octavia.yaml b/overlays/octavia.yaml
index d1b3e0f..7f6ba84 100644
--- a/overlays/octavia.yaml
+++ b/overlays/octavia.yaml
@@ -5,7 +5,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   octavia:
     charm: cs:~openstack-charmers-next/octavia
-    num_units: 1
+    num_units: __NUM_OCTAVIA_UNITS__
     options:
       debug: *debug
       openstack-origin: __OS_ORIGIN__
diff --git a/overlays/openstack-dashboard-ha.yaml b/overlays/openstack-dashboard-ha.yaml
index 7fb355e..4d80a2b 100644
--- a/overlays/openstack-dashboard-ha.yaml
+++ b/overlays/openstack-dashboard-ha.yaml
@@ -1,6 +1,5 @@
 applications:
   openstack-dashboard:
-    num_units: __NUM_HORIZON_UNITS__
     options:
       vip: __VIP__
   openstack-dashboard-hacluster:
diff --git a/overlays/rabbitmq-server-ha.yaml b/overlays/rabbitmq-server-ha.yaml
deleted file mode 100644
index 8a78a22..0000000
--- a/overlays/rabbitmq-server-ha.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-applications:
-  rabbitmq-server:
-    num_units: __NUM_RABBIT_UNITS__
-    options:
-      min-cluster-size: __NUM_RABBIT_UNITS__
-
diff --git a/overlays/swift-ha.yaml b/overlays/swift-ha.yaml
index fad248a..1166ffa 100644
--- a/overlays/swift-ha.yaml
+++ b/overlays/swift-ha.yaml
@@ -1,11 +1,9 @@
 applications:
   swift-proxy:
-    num_units: __NUM_SWIFT_PROXY_UNITS__
     options:
       vip: __VIP__
   swift-proxy-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
     options:
       cluster_count: __NUM_SWIFT_PROXY_UNITS__
 relations:
diff --git a/overlays/swift.yaml b/overlays/swift.yaml
index 9d69761..8229ca3 100644
--- a/overlays/swift.yaml
+++ b/overlays/swift.yaml
@@ -7,7 +7,7 @@ ssl_key:                    &ssl_key                   __SSL_KEY__
 
 applications:
   swift-proxy:
-    num_units: 1
+    num_units: __NUM_SWIFT_PROXY_UNITS__
     charm: cs:~openstack-charmers-next/swift-proxy
     constraints: mem=1G
     options:
diff --git a/overlays/telemetry-ha.yaml b/overlays/telemetry-ha.yaml
index 21bdc5a..0fa7331 100644
--- a/overlays/telemetry-ha.yaml
+++ b/overlays/telemetry-ha.yaml
@@ -1,14 +1,11 @@
 applications:
   ceilometer:
-    num_units: __NUM_TELEMETRY_UNITS__
     options:
       vip: __VIP__
   aodh:
-    num_units: __NUM_TELEMETRY_UNITS__
     options:
       vip: __VIP__
   gnocchi:
-    num_units: __NUM_TELEMETRY_UNITS__
     options:
       vip: __VIP__
   ceilometer-hacluster:
diff --git a/overlays/telemetry-legacy-aodh.yaml b/overlays/telemetry-legacy-aodh.yaml
index 579f439..09dd655 100644
--- a/overlays/telemetry-legacy-aodh.yaml
+++ b/overlays/telemetry-legacy-aodh.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   ceilometer:
     charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
@@ -16,7 +16,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceilometer-agent
   aodh:
     charm: cs:~openstack-charmers-next/aodh
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/overlays/telemetry-legacy.yaml b/overlays/telemetry-legacy.yaml
index cc198a4..6638b98 100644
--- a/overlays/telemetry-legacy.yaml
+++ b/overlays/telemetry-legacy.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   ceilometer:
     charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/overlays/telemetry.yaml b/overlays/telemetry.yaml
index c3bb0fb..0f48459 100644
--- a/overlays/telemetry.yaml
+++ b/overlays/telemetry.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   ceilometer:
     charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
@@ -16,7 +16,7 @@ applications:
     charm: cs:~openstack-charmers-next/ceilometer-agent
   aodh:
     charm: cs:~openstack-charmers-next/aodh
-    num_units: 1
+    num_units: __NUM_TELEMETRY_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/swift/module_defaults b/swift/module_defaults
new file mode 100644
index 0000000..71a5e90
--- /dev/null
+++ b/swift/module_defaults
@@ -0,0 +1,13 @@
+# This file must contain defaults for all variables used in bundles/ovelays.
+# They are used to render to final product in the event they are not provided
+# elsewhere. It is inserted into the global context at the start of the
+# pipeline.
+#
+# You can check that none are missing by running lint/check_var_defaults.sh
+#
+MOD_PARAMS[__OS_ORIGIN__]=$os_origin
+MOD_PARAMS[__SOURCE__]=$source
+MOD_PARAMS[__SSL_CA__]=
+MOD_PARAMS[__SSL_CERT__]=
+MOD_PARAMS[__SSL_KEY__]=
+MOD_PARAMS[__NUM_SWIFT_PROXY_UNITS__]=1
diff --git a/swift/pipeline/01setup b/swift/pipeline/00setup
similarity index 100%
rename from swift/pipeline/01setup
rename to swift/pipeline/00setup
diff --git a/swift/pipeline/01import-config-defaults b/swift/pipeline/01import-config-defaults
new file mode 100644
index 0000000..be9c1f7
--- /dev/null
+++ b/swift/pipeline/01import-config-defaults
@@ -0,0 +1,6 @@
+# Start with dependency defaults in case we want to override any locally
+. ../.module_defaults/openstack
+. ../.module_defaults/kubernetes  # needed for etcd, easyrsa etc
+
+# Current module imports
+. module_defaults 
diff --git a/swift/pipeline/02configure b/swift/pipeline/02configure
index fe72467..bdcdb59 100644
--- a/swift/pipeline/02configure
+++ b/swift/pipeline/02configure
@@ -1,18 +1,10 @@
-#!/bin/bash
-# NOTE: global variables must be first defined in 01setup
+#!/bin/bash -eu
+# Global variables are first defined in 00setup and module
+# dependencies are defined in 01import-config-defaults
+#
+# All overlay/bundle variables (MOD_PARAMS) defaults must go into
+# the <module>/module_defaults file.
 
-# Bundle template parameters. These should correspond to variables set at the top
-# of yaml bundle and overlay templates.
-MOD_PARAMS[__OS_ORIGIN__]=$os_origin
-MOD_PARAMS[__SOURCE__]=$source
-MOD_PARAMS[__NUM_VAULT_UNITS__]=1  # there are > 1 vault* overlay so need to use a global with default
-MOD_PARAMS[__SSL_CA__]=
-MOD_PARAMS[__SSL_CERT__]=
-MOD_PARAMS[__SSL_KEY__]=
-MOD_PARAMS[__NUM_ETCD_UNITS__]=1
-MOD_PARAMS[__ETCD_SNAP_CHANNEL__]='latest/stable'
-MOD_PARAMS[__GRAYLOG_SNAP_CHANNEL__]='3/stable'
-MOD_PARAMS[__GRAFANA_SNAP_CHANNEL__]='stable'
 
 # We always add this overlay since it contains core apps for this module.
 MOD_OVERLAYS+=( swift.yaml )