Merge ~hopem/stsstack-bundles:move-ks-to-overlay into stsstack-bundles:master

[Edward Hope-Morley]

[Tiago Pasqualini da Silva (tiago.pasqualini)]

review: Approve

diff --git a/ceph/ceph.yaml.template b/ceph/ceph.yaml.template
index aaa2cc9..b355b64 100644
--- a/ceph/ceph.yaml.template
+++ b/ceph/ceph.yaml.template
@@ -33,15 +33,6 @@ applications:
       osd-devices: ''  # must be empty string when using juju storage
     storage:
       osd-devices: cinder,10G,1
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    constraints: mem=1G
-    options:
-      debug: *debug
-      verbose: *verbose
-      admin-password: openstack
-      openstack-origin: *openstack_origin
   glance:
     num_units: 1
     charm: cs:~openstack-charmers-next/glance
diff --git a/ceph/pipeline/02configure b/ceph/pipeline/02configure
index e89ac4b..0179af4 100644
--- a/ceph/pipeline/02configure
+++ b/ceph/pipeline/02configure
@@ -5,6 +5,9 @@
 # All overlay/bundle variables (MOD_PARAMS) defaults must go into
 # the <module>/module_defaults file.
 
+# Needed in all cases
+MOD_OVERLAYS+=( "keystone.yaml" )
+
 # NOTE: this is (should be) the same across all modules using mysql
 if has_min_series focal; then
     # There is no Focal support for percona-cluster
diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
index d5b05b6..b1e2fd0 100644
--- a/openstack/openstack.yaml.template
+++ b/openstack/openstack.yaml.template
@@ -24,18 +24,6 @@ applications:
     options:
       source: *source
       min-cluster-size: __NUM_RABBIT_UNITS__
-  keystone:
-    num_units: __NUM_KEYSTONE_UNITS__
-    charm: cs:~openstack-charmers-next/keystone
-    constraints: mem=1G
-    options:
-      debug: *debug
-      verbose: *verbose
-      admin-password: openstack
-      openstack-origin: *openstack_origin
-      ssl_ca: *ssl_ca
-      ssl_cert: *ssl_cert
-      ssl_key: *ssl_key
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: __NUM_COMPUTE_UNITS__
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index 0ddbe2d..05a8057 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -17,6 +17,9 @@ is_neutron_gateway_required ()
     fi
 }
 
+# Needed in all cases
+MOD_OVERLAYS+=( "keystone.yaml" )
+
 if is_neutron_gateway_required; then
     MOD_OVERLAYS+=( "neutron-gateway.yaml" )
 fi
diff --git a/overlays/keystone.yaml b/overlays/keystone.yaml
new file mode 100644
index 0000000..839b7a0
--- /dev/null
+++ b/overlays/keystone.yaml
@@ -0,0 +1,23 @@
+# Variables
+debug:                      &debug                     True
+verbose:                    &verbose                   True
+openstack_origin:           &openstack_origin          __OS_ORIGIN__
+
+ssl_ca:                     &ssl_ca                    __SSL_CA__
+ssl_cert:                   &ssl_cert                  __SSL_CERT__
+ssl_key:                    &ssl_key                   __SSL_KEY__
+
+applications:
+  keystone:
+    num_units: __NUM_KEYSTONE_UNITS__
+    charm: cs:~openstack-charmers-next/keystone
+    constraints: mem=1G
+    options:
+      debug: *debug
+      verbose: *verbose
+      admin-password: openstack
+      openstack-origin: *openstack_origin
+      ssl_ca: *ssl_ca
+      ssl_cert: *ssl_cert
+      ssl_key: *ssl_key
+
diff --git a/swift/pipeline/02configure b/swift/pipeline/02configure
index 5910ef3..e91f6fb 100644
--- a/swift/pipeline/02configure
+++ b/swift/pipeline/02configure
@@ -5,6 +5,9 @@
 # All overlay/bundle variables (MOD_PARAMS) defaults must go into
 # the <module>/module_defaults file.
 
+# Needed in all cases
+MOD_OVERLAYS+=( "keystone.yaml" )
+
 # NOTE: this is (should be) the same across all modules using mysql
 if has_min_series focal; then
     # There is no Focal support for percona-cluster
diff --git a/swift/swift.yaml.template b/swift/swift.yaml.template
index c0307d3..a295838 100644
--- a/swift/swift.yaml.template
+++ b/swift/swift.yaml.template
@@ -13,15 +13,6 @@ source:                     &source                    __SOURCE__
 
 series: __SERIES__
 applications:
-  keystone:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
-    constraints: mem=1G
-    options:
-      debug: *debug
-      verbose: *verbose
-      admin-password: openstack
-      openstack-origin: *openstack_origin
   glance:
     num_units: 1
     charm: cs:~openstack-charmers-next/glance