Remove mentions of extra cells yet

Those will be added back in a follow up, which completes the guide and tests for extra cell2 and cell3. Signed-off-by: Bohdan Dobrelia <[email protected]>
openstack-k8s-operators · Dec 12, 2024 · 6864b79 · 6864b79
1 parent 7b7e3a3
commit 6864b79
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 71 deletions.
diff --git a/docs_user/modules/proc_deploying-backend-services.adoc b/docs_user/modules/proc_deploying-backend-services.adoc
@@ -273,14 +273,6 @@ endif::[]
         secret: osp-secret
         replicas: 3
         storageRequest: 5G
-      openstack-cell2:
-        secret: osp-secret
-        replicas: 1
-        storageRequest: 5G
-      openstack-cell3:
-        secret: osp-secret
-        replicas: 1
-        storageRequest: 5G
   memcached:
     enabled: true
     templates:
@@ -360,28 +352,6 @@ ifeval::["{OpenStackPreviousInstaller}" == "director_operator"]
 endif::[]
             spec:
               type: LoadBalancer
-      rabbitmq-cell2:
-        persistence:
-          storage: 1G
-        override:
-          service:
-            metadata:
-              annotations:
-                metallb.universe.tf/address-pool: internalapi
-                metallb.universe.tf/loadBalancerIPs: 172.17.0.87
-            spec:
-              type: LoadBalancer
-      rabbitmq-cell3:
-        persistence:
-          storage: 1G
-        override:
-          service:
-            metadata:
-              annotations:
-                metallb.universe.tf/address-pool: internalapi
-                metallb.universe.tf/loadBalancerIPs: 172.17.0.88
-            spec:
-              type: LoadBalancer
   telemetry:
     enabled: false
 
@@ -405,16 +375,16 @@ endif::[]
 +
 <1> Select an existing storage class in your {OpenShiftShort} cluster.
 
-This example provides required infrastructure database and messaging services for a 3 compute cells
-named `cell1`, `cell2`, and `cell3`. Adjust the names, counts, IP addresses, and numbers,
+This example provides required infrastructure database and messaging services for a 1 compute cell
+named `cell1`. Adjust the names, counts, IP addresses, and numbers,
 like `replicas`, `storage`, or `storageRequest`, as needed.
 
 .Verification
 
 * Verify that MariaDB and RabbitMQ are running, for all defined cells:
 +
 ----
-$ RENAMED_CELLS="cell1 cell2 cell3"
+$ RENAMED_CELLS="cell1"
 $ oc get pod openstack-galera-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
 $ oc get pod rabbitmq-server-0 -o jsonpath='{.status.phase}{"\n"}' | grep Running
 $ for CELL in $(echo $RENAMED_CELLS); do

diff --git a/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc b/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
@@ -26,9 +26,9 @@ $ STORAGE_CLASS=local-storage
 $ MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.0
 endif::[]
 
-$ CELLS="default cell1 cell2"
-$ DEFAULT_CELL_NAME="cell3"
-$ RENAMED_CELLS="cell1 cell2 $DEFAULT_CELL_NAME"
+$ CELLS="default"
+$ DEFAULT_CELL_NAME="cell1"
+$ RENAMED_CELLS="$DEFAULT_CELL_NAME"
 
 $ NAMESPACE="openstack"
 

diff --git a/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc b/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc
@@ -23,7 +23,7 @@ $ MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.
 endif::[]
 $ declare -A TRIPLEO_PASSWORDS
 ifeval::["{OpenStackPreviousInstaller}" != "director_operator"]
-$ CELLS="default cell1 cell2"
+$ CELLS="default"
 $ for CELL in $(echo $CELLS); do
 >    TRIPLEO_PASSWORDS[$CELL]="$PASSWORD_FILE"
 > done

diff --git a/docs_user/modules/proc_stopping-openstack-services.adoc b/docs_user/modules/proc_stopping-openstack-services.adoc
@@ -39,7 +39,7 @@ CONTROLLER2_SSH="ssh -i *<path to SSH key>* root@*<controller-2 IP>*"
 CONTROLLER3_SSH="ssh -i *<path to SSH key>* root@*<controller-3 IP>*"
 endif::[]
 ----
-* For a multi-cell deployment, specify the overcloud and cell controllers IPs instead, for example:
+* Specify IP addresses of all controllers, for example:
 +
 [subs=+quotes]
 ----
@@ -57,7 +57,7 @@ endif::[]
 ----
 ifeval::["{build}" == "downstream"]
 <1> Replace `<path_to_SSH_key>` with the path to your SSH key.
-<2> Replace `<controller-X IP>` with IP addresses  of all controllers, includinig cell controllers.
+<2> Replace `<controller-X IP>` with IP addresses of all controllers.
 endif::[]
 
 .Procedure

diff --git a/tests/roles/backend_services/templates/openstack_control_plane.j2 b/tests/roles/backend_services/templates/openstack_control_plane.j2
@@ -82,15 +82,6 @@ spec:
         secret: osp-secret
         replicas: 1
         storageRequest: 1Gi
-      # TODO(bogdando): iterate based on renamed_cells value in kustomization.yaml
-      openstack-cell2:
-        secret: osp-secret
-        replicas: 1
-        storageRequest: 1Gi
-      openstack-cell3:
-        secret: osp-secret
-        replicas: 1
-        storageRequest: 1Gi
 
   memcached:
     enabled: true
@@ -151,29 +142,6 @@ spec:
                 metallb.universe.tf/loadBalancerIPs: 172.17.0.86
             spec:
               type: LoadBalancer
-      # TODO(bogdando): iterate based on renamed_cells value in kustomization.yaml
-      rabbitmq-cell2:
-        persistence:
-          storage: 1Gi
-        override:
-          service:
-            metadata:
-              annotations:
-                metallb.universe.tf/address-pool: internalapi
-                metallb.universe.tf/loadBalancerIPs: 172.17.0.87
-            spec:
-              type: LoadBalancer
-      rabbitmq-cell3:
-        persistence:
-          storage: 1Gi
-        override:
-          service:
-            metadata:
-              annotations:
-                metallb.universe.tf/address-pool: internalapi
-                metallb.universe.tf/loadBalancerIPs: 172.17.0.88
-            spec:
-              type: LoadBalancer
   telemetry:
     enabled: false