From d2344c805b07ff7ee79814ee045fcc9f7b31d388 Mon Sep 17 00:00:00 2001 From: Bohdan Dobrelia Date: Mon, 29 May 2023 17:06:58 +0200 Subject: [PATCH] Modify default CR sample for my nova-devel case ?No longer relevant, see https://github.com/openstack-k8s-operators/openstack-operator/pull/416#discussion_r1297076021 Isol-net CRs to become collapsed cells as well Not clear for cell-local vs global services replicas Turn off unrelated services (for my Nova dev specifc needs) TODO: this to end up in https://github.com/openstack-k8s-operators/data-plane-adoption/blob/main/tests/roles/backend_services/tasks/main.yaml#L41 Signed-off-by: Bohdan Dobrelia --- ...controlplane_galera_network_isolation.yaml | 100 ++++++++++++++--- ...enstackcontrolplane_network_isolation.yaml | 102 +++++++++++++++--- 2 files changed, 172 insertions(+), 30 deletions(-) diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 806f20ce3..84a0950d6 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -17,10 +17,12 @@ spec: - 192.168.122.1 replicas: 1 cinder: + enabled: false template: databaseInstance: openstack secret: osp-secret cinderAPI: + replicas: 0 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -37,12 +39,15 @@ spec: networkAttachments: - storage replicas: 0 # backend needs to be configured + cinderScheduler: + replicas: 0 glance: template: databaseInstance: openstack storageClass: "" storageRequest: 10G glanceAPIInternal: + replicas: 1 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -51,6 +56,7 @@ spec: networkAttachments: - storage glanceAPIExternal: + replicas: 0 networkAttachments: - storage keystone: @@ -96,12 +102,52 @@ spec: networkAttachments: - internalapi horizon: + enabled: false template: - replicas: 1 + replicas: 0 secret: osp-secret nova: + enabled: true # install CRDs, run nothing (for local debug) template: + # This creates a collapsed cell deployment same as what OSP17 does by + # default. The conductor in cell1 acts as both the cell conductor and the + # super conductor hence cell0 conductor is disabled. Also in this + # deployment both the top level services and cell1 service will share the + # same message bus and database service instance so there is no cell + # separation implemented. + cellTemplates: + cell0: + cellDatabaseUser: nova_cell0 + noVNCProxyServiceTemplate: + replicas: 0 # must remain 0? + metadataServiceTemplate: + replicas: 0 # must remain 0? + conductorServiceTemplate: + replicas: 0 # must remain 0 + externalEndpoints: + - endpoint: internal + ipAddressPool: internalapi + loadBalancerIPs: + - 172.17.0.80 + hasAPIAccess: true + cell1: + cellDatabaseUser: nova_cell1 + cellDatabaseInstance: openstack + cellMessageBusInstance: rabbitmq + noVNCProxyServiceTemplate: + replicas: 0 #1, to be started locally + metadataServiceTemplate: + replicas: 0 #1, to be started locally + conductorServiceTemplate: + replicas: 0 #1, to be started locally + hasAPIAccess: true + externalEndpoints: + - endpoint: internal + ipAddressPool: internalapi + loadBalancerIPs: + - 172.17.0.80 apiServiceTemplate: + replicas: 0 #1, to be started locally externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -109,15 +155,21 @@ spec: - 172.17.0.80 secret: osp-secret metadataServiceTemplate: + replicas: 0 #1, to be started locally externalEndpoints: - endpoint: internal ipAddressPool: internalapi loadBalancerIPs: - 172.17.0.80 + schedulerServiceTemplate: + replicas: 0 #1, to be started locally + noVNCProxyServiceTemplate: + replicas: 0 #1, to be started locally, or just for cell1? manila: + enabled: false template: manilaAPI: - replicas: 1 + replicas: 0 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -126,26 +178,32 @@ spec: networkAttachments: - internalapi manilaScheduler: - replicas: 1 + replicas: 0 + networkAttachments: + - internalapi manilaShares: share1: - replicas: 1 + replicas: 0 networkAttachments: - storage ovn: template: ovnDBCluster: ovndbcluster-nb: + replicas: 1 dbType: NB storageRequest: 10G networkAttachment: internalapi ovndbcluster-sb: + replicas: 1 dbType: SB storageRequest: 10G networkAttachment: internalapi ovnNorthd: + replicas: 1 networkAttachment: internalapi ovnController: + replicas: 1 external-ids: system-id: "random" ovn-bridge: "br-int" @@ -163,12 +221,21 @@ spec: rabbitmq: templates: rabbitmq: + replicas: 1 + resources: + requests: + cpu: 150m + memory: 250Mi + limits: + cpu: 300m + memory: 500Mi externalEndpoint: loadBalancerIPs: - 172.17.0.85 ipAddressPool: internalapi sharedIP: false rabbitmq-cell1: + replicas: 1 externalEndpoint: loadBalancerIPs: - 172.17.0.86 @@ -179,43 +246,46 @@ spec: template: databaseInstance: openstack heatAPI: - replicas: 1 + replicas: 0 heatEngine: - replicas: 1 + replicas: 0 + heatCfnAPI: + replicas: 0 secret: osp-secret ironic: enabled: false template: databaseInstance: openstack ironicAPI: - replicas: 1 + replicas: 0 ironicConductors: - - replicas: 1 + - replicas: 0 storageRequest: 10G ironicInspector: - replicas: 1 + replicas: 0 ironicNeutronAgent: - replicas: 1 + replicas: 0 secret: osp-secret ceilometer: + enabled: false template: passwordSelector: service: CeilometerPassword secret: osp-secret serviceUser: ceilometer swift: - enabled: true + enabled: false template: swiftRing: - ringReplicas: 1 + ringReplicas: 0 swiftStorage: - replicas: 1 + replicas: 0 swiftProxy: - replicas: 1 + replicas: 0 octavia: enabled: false template: databaseInstance: openstack octaviaAPI: - replicas: 1 + replicas: 0 secret: osp-secret diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index b618dfe21..51e398db6 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -17,10 +17,12 @@ spec: - 192.168.122.1 replicas: 1 cinder: + enabled: false template: databaseInstance: openstack secret: osp-secret cinderAPI: + replicas: 0 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -37,12 +39,15 @@ spec: networkAttachments: - storage replicas: 0 # backend needs to be configured + cinderScheduler: + replicas: 0 glance: template: databaseInstance: openstack storageClass: "" storageRequest: 10G glanceAPIInternal: + replicas: 1 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -51,6 +56,7 @@ spec: networkAttachments: - storage glanceAPIExternal: + replicas: 0 networkAttachments: - storage keystone: @@ -62,6 +68,8 @@ spec: ipAddressPool: internalapi loadBalancerIPs: - 172.17.0.80 + galera: + enabled: false mariadb: templates: openstack: @@ -84,12 +92,52 @@ spec: networkAttachments: - internalapi horizon: + enabled: false template: - replicas: 1 + replicas: 0 secret: osp-secret nova: + enabled: true # install CRDs, run nothing (for local debug) template: + # This creates a collapsed cell deployment same as what OSP17 does by + # default. The conductor in cell1 acts as both the cell conductor and the + # super conductor hence cell0 conductor is disabled. Also in this + # deployment both the top level services and cell1 service will share the + # same message bus and database service instance so there is no cell + # separation implemented. + cellTemplates: + cell0: + cellDatabaseUser: nova_cell0 + noVNCProxyServiceTemplate: + replicas: 0 # must remain 0? + metadataServiceTemplate: + replicas: 0 # must remain 0? + conductorServiceTemplate: + replicas: 0 # must remain 0 + externalEndpoints: + - endpoint: internal + ipAddressPool: internalapi + loadBalancerIPs: + - 172.17.0.80 + hasAPIAccess: true + cell1: + cellDatabaseUser: nova_cell1 + cellDatabaseInstance: openstack + cellMessageBusInstance: rabbitmq + noVNCProxyServiceTemplate: + replicas: 0 #1, to be started locally + metadataServiceTemplate: + replicas: 0 #1, to be started locally + conductorServiceTemplate: + replicas: 0 #1, to be started locally + hasAPIAccess: true + externalEndpoints: + - endpoint: internal + ipAddressPool: internalapi + loadBalancerIPs: + - 172.17.0.80 apiServiceTemplate: + replicas: 0 #1, to be started locally externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -97,15 +145,21 @@ spec: - 172.17.0.80 secret: osp-secret metadataServiceTemplate: + replicas: 0 #1, to be started locally externalEndpoints: - endpoint: internal ipAddressPool: internalapi loadBalancerIPs: - 172.17.0.80 + schedulerServiceTemplate: + replicas: 0 #1, to be started locally + noVNCProxyServiceTemplate: + replicas: 0 #1, to be started locally, or just for cell1? manila: + enabled: false template: manilaAPI: - replicas: 1 + replicas: 0 externalEndpoints: - endpoint: internal ipAddressPool: internalapi @@ -114,26 +168,32 @@ spec: networkAttachments: - internalapi manilaScheduler: - replicas: 1 + replicas: 0 + networkAttachments: + - internalapi manilaShares: share1: - replicas: 1 + replicas: 0 networkAttachments: - storage ovn: template: ovnDBCluster: ovndbcluster-nb: + replicas: 1 dbType: NB storageRequest: 10G networkAttachment: internalapi ovndbcluster-sb: + replicas: 1 dbType: SB storageRequest: 10G networkAttachment: internalapi ovnNorthd: + replicas: 1 networkAttachment: internalapi ovnController: + replicas: 1 external-ids: system-id: "random" ovn-bridge: "br-int" @@ -151,12 +211,21 @@ spec: rabbitmq: templates: rabbitmq: + replicas: 1 + resources: + requests: + cpu: 150m + memory: 250Mi + limits: + cpu: 300m + memory: 500Mi externalEndpoint: loadBalancerIPs: - 172.17.0.85 ipAddressPool: internalapi sharedIP: false rabbitmq-cell1: + replicas: 1 externalEndpoint: loadBalancerIPs: - 172.17.0.86 @@ -167,43 +236,46 @@ spec: template: databaseInstance: openstack heatAPI: - replicas: 1 + replicas: 0 heatEngine: - replicas: 1 + replicas: 0 + heatCfnAPI: + replicas: 0 secret: osp-secret ironic: enabled: false template: databaseInstance: openstack ironicAPI: - replicas: 1 + replicas: 0 ironicConductors: - - replicas: 1 + - replicas: 0 storageRequest: 10G ironicInspector: - replicas: 1 + replicas: 0 ironicNeutronAgent: - replicas: 1 + replicas: 0 secret: osp-secret ceilometer: + enabled: false template: passwordSelector: service: CeilometerPassword secret: osp-secret serviceUser: ceilometer swift: - enabled: true + enabled: false template: swiftRing: - ringReplicas: 1 + ringReplicas: 0 swiftStorage: - replicas: 1 + replicas: 0 swiftProxy: - replicas: 1 + replicas: 0 octavia: enabled: false template: databaseInstance: openstack octaviaAPI: - replicas: 1 + replicas: 0 secret: osp-secret