Merge pull request openstack-k8s-operators#265 from gibizer/cell1-dat…

…abase Adapt to having separate DB for cell1 by default
ASBishop · Apr 6, 2023 · 1110f19 · 1110f19
2 parents a00604b + 9af7f35
commit 1110f19
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 130 deletions.
diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml
@@ -15,6 +15,9 @@ spec:
       openstack:
         containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
         storageRequest: 500M
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageRequest: 500M
   galera:
     enabled: false
     templates:
@@ -24,6 +27,12 @@ spec:
         storageRequest: 500M
         secret: osp-secret
         replicas: 1
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageClass: local-storage
+        storageRequest: 500M
+        secret: osp-secret
+        replicas: 1
   rabbitmq:
     templates:
       rabbitmq:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
@@ -109,6 +109,8 @@ spec:
             hasAPIAccess: true
           cell1:
             cellDatabaseUser: nova_cell1
+            cellDatabaseInstance: openstack
+            cellMessageBusInstance: rabbitmq
             conductorServiceTemplate:
               replicas: 1
             hasAPIAccess: true

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -16,6 +16,9 @@ spec:
       openstack:
         containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
         storageRequest: 500M
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageRequest: 500M
   galera:
     enabled: true
     templates:
@@ -25,6 +28,12 @@ spec:
         storageRequest: 500M
         secret: osp-secret
         replicas: 1
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageClass: local-storage
+        storageRequest: 500M
+        secret: osp-secret
+        replicas: 1
   rabbitmq:
     templates:
       rabbitmq:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -63,6 +63,9 @@ spec:
       openstack:
         containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
         storageRequest: 500M
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageRequest: 500M
   memcached:
     enabled: true
     templates:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml
@@ -107,6 +107,9 @@ spec:
       openstack:
         containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
         storageRequest: 500M
+      openstack-cell1:
+        containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo
+        storageRequest: 500M
   memcached:
     enabled: true
     templates:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml b/config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -2,6 +2,5 @@
 resources:
 - core_v1beta1_openstackcontrolplane.yaml
 - core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
-- core_v1beta1_openstackcontrolplane_separate_cell_db.yaml
 - core_v1beta1_openstackcontrolplane_network_isolation.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples