From e776e53fadcfc98e3489d611ca5c40d966df439a Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Fri, 29 Sep 2023 19:19:38 +0100 Subject: [PATCH] Update services routes https://github.com/openstack-k8s-operators/openstack-operator/pull/457 Signed-off-by: Fabricio Aguiar --- docs/openstack/backend_services_deployment.md | 42 +++++++++++-------- docs/openstack/cinder_adoption.md | 17 +++++--- docs/openstack/glance_adoption.md | 21 +++++----- docs/openstack/helpers/cinder-cfg.py | 17 +++++--- docs/openstack/keystone_adoption.md | 17 +++++--- docs/openstack/neutron_adoption.md | 17 +++++--- docs/openstack/placement_adoption.md | 17 +++++--- .../config/base/openstack_control_plane.yaml | 42 +++++++++++-------- .../container_image_overrides.yaml | 41 +++++++++++------- tests/roles/cinder_adoption/tasks/main.yaml | 17 +++++--- tests/roles/glance_adoption/tasks/main.yaml | 30 ++++++++----- tests/roles/keystone_adoption/tasks/main.yaml | 22 ++++++---- tests/roles/neutron_adoption/tasks/main.yaml | 17 +++++--- .../roles/placement_adoption/tasks/main.yaml | 17 +++++--- 14 files changed, 217 insertions(+), 117 deletions(-) diff --git a/docs/openstack/backend_services_deployment.md b/docs/openstack/backend_services_deployment.md index 056b48107..456e67a6e 100644 --- a/docs/openstack/backend_services_deployment.md +++ b/docs/openstack/backend_services_deployment.md @@ -125,12 +125,16 @@ podified OpenStack control plane services. cinderVolumes: {} dns: - enabled: true template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: @@ -200,19 +204,23 @@ podified OpenStack control plane services. rabbitmq: templates: rabbitmq: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.85 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.85 + spec: + type: LoadBalancer rabbitmq-cell1: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.86 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.86 + spec: + type: LoadBalancer telemetry: enabled: false diff --git a/docs/openstack/cinder_adoption.md b/docs/openstack/cinder_adoption.md index cb439bf11..14b485e21 100644 --- a/docs/openstack/cinder_adoption.md +++ b/docs/openstack/cinder_adoption.md @@ -704,16 +704,23 @@ spec: name: ceph-conf-files cinder: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack secret: osp-secret cinderAPI: + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer replicas: 1 - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 customServiceConfig: | [DEFAULT] default_volume_type=tripleo diff --git a/docs/openstack/glance_adoption.md b/docs/openstack/glance_adoption.md index 4aa96fabf..0e3fa3f20 100644 --- a/docs/openstack/glance_adoption.md +++ b/docs/openstack/glance_adoption.md @@ -36,16 +36,22 @@ oc patch openstackcontrolplane openstack --type=merge --patch ' spec: glance: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack storageClass: "local-storage" storageRequest: 10G glanceAPIInternal: - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer networkAttachments: - storage glanceAPIExternal: @@ -88,11 +94,6 @@ spec: storageClass: "local-storage" storageRequest: 10G glanceAPIInternal: - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 networkAttachments: - storage glanceAPIExternal: diff --git a/docs/openstack/helpers/cinder-cfg.py b/docs/openstack/helpers/cinder-cfg.py index 1f2b42b14..f6ab463d9 100644 --- a/docs/openstack/helpers/cinder-cfg.py +++ b/docs/openstack/helpers/cinder-cfg.py @@ -24,16 +24,23 @@ spec: cinder: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack secret: osp-secret cinderAPI: replicas: 3 - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer cinderScheduler: replicas: 1 cinderBackup: diff --git a/docs/openstack/keystone_adoption.md b/docs/openstack/keystone_adoption.md index 285e8d8ef..6416056c4 100644 --- a/docs/openstack/keystone_adoption.md +++ b/docs/openstack/keystone_adoption.md @@ -18,14 +18,21 @@ spec: keystone: enabled: true + apiOverride: + route: {} template: + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer databaseInstance: openstack secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 ' ``` diff --git a/docs/openstack/neutron_adoption.md b/docs/openstack/neutron_adoption.md index 24a9369e4..ce589b3e1 100644 --- a/docs/openstack/neutron_adoption.md +++ b/docs/openstack/neutron_adoption.md @@ -30,14 +30,21 @@ oc patch openstackcontrolplane openstack --type=merge --patch ' spec: neutron: enabled: true + apiOverride: + route: {} template: + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer databaseInstance: openstack secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 networkAttachments: - internalapi ' diff --git a/docs/openstack/placement_adoption.md b/docs/openstack/placement_adoption.md index 7a589f9ef..44abc147e 100644 --- a/docs/openstack/placement_adoption.md +++ b/docs/openstack/placement_adoption.md @@ -18,14 +18,21 @@ spec: placement: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer ' ``` diff --git a/tests/config/base/openstack_control_plane.yaml b/tests/config/base/openstack_control_plane.yaml index 57d832c49..bf9e61950 100644 --- a/tests/config/base/openstack_control_plane.yaml +++ b/tests/config/base/openstack_control_plane.yaml @@ -15,12 +15,16 @@ spec: cinderVolumes: {} dns: - enabled: true template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: @@ -101,19 +105,23 @@ spec: rabbitmq: templates: rabbitmq: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.85 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.85 + spec: + type: LoadBalancer rabbitmq-cell1: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.86 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.86 + spec: + type: LoadBalancer telemetry: enabled: false diff --git a/tests/config/periodic_ci/container_image_overrides.yaml b/tests/config/periodic_ci/container_image_overrides.yaml index c5a319189..d8ec523c7 100644 --- a/tests/config/periodic_ci/container_image_overrides.yaml +++ b/tests/config/periodic_ci/container_image_overrides.yaml @@ -14,10 +14,15 @@ spec: dns: template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: @@ -89,19 +94,23 @@ spec: rabbitmq: templates: rabbitmq: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.85 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.85 + spec: + type: LoadBalancer rabbitmq-cell1: - externalEndpoint: - loadBalancerIPs: - - 172.17.0.86 - ipAddressPool: internalapi - sharedIP: false - replicas: 1 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.86 + spec: + type: LoadBalancer telemetry: enabled: false diff --git a/tests/roles/cinder_adoption/tasks/main.yaml b/tests/roles/cinder_adoption/tasks/main.yaml index 6a5ba59fc..5e1c26b15 100644 --- a/tests/roles/cinder_adoption/tasks/main.yaml +++ b/tests/roles/cinder_adoption/tasks/main.yaml @@ -6,15 +6,22 @@ spec: cinder: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack secret: osp-secret cinderAPI: - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer cinderBackup: networkAttachments: - storage diff --git a/tests/roles/glance_adoption/tasks/main.yaml b/tests/roles/glance_adoption/tasks/main.yaml index 93ba1eead..be35bb30f 100644 --- a/tests/roles/glance_adoption/tasks/main.yaml +++ b/tests/roles/glance_adoption/tasks/main.yaml @@ -6,16 +6,22 @@ spec: glance: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack storageClass: "local-storage" storageRequest: 10G glanceAPIInternal: - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer networkAttachments: - storage glanceAPIExternal: @@ -48,11 +54,15 @@ storageClass: "local-storage" storageRequest: 10G glanceAPIInternal: - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer networkAttachments: - storage glanceAPIExternal: diff --git a/tests/roles/keystone_adoption/tasks/main.yaml b/tests/roles/keystone_adoption/tasks/main.yaml index 48154e809..94f47eeba 100644 --- a/tests/roles/keystone_adoption/tasks/main.yaml +++ b/tests/roles/keystone_adoption/tasks/main.yaml @@ -6,13 +6,21 @@ spec: keystone: enabled: true - databaseInstance: openstack - secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + apiOverride: + route: {} + template: + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer + databaseInstance: openstack + secret: osp-secret ' - name: wait for Keystone to start up diff --git a/tests/roles/neutron_adoption/tasks/main.yaml b/tests/roles/neutron_adoption/tasks/main.yaml index 34b3e229e..6e0309095 100644 --- a/tests/roles/neutron_adoption/tasks/main.yaml +++ b/tests/roles/neutron_adoption/tasks/main.yaml @@ -6,14 +6,21 @@ spec: neutron: enabled: true + apiOverride: + route: {} template: + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer databaseInstance: openstack secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 networkAttachments: - internalapi ' diff --git a/tests/roles/placement_adoption/tasks/main.yaml b/tests/roles/placement_adoption/tasks/main.yaml index 2c8f1f71c..597423787 100644 --- a/tests/roles/placement_adoption/tasks/main.yaml +++ b/tests/roles/placement_adoption/tasks/main.yaml @@ -6,14 +6,21 @@ spec: placement: enabled: true + apiOverride: + route: {} template: databaseInstance: openstack secret: osp-secret - externalEndpoints: - - endpoint: internal - ipAddressPool: internalapi - loadBalancerIPs: - - 172.17.0.80 + override: + service: + internal: + metadata: + annotations: + metallb.universe.tf/address-pool: internalapi + metallb.universe.tf/allow-shared-ip: internalapi + metallb.universe.tf/loadBalancerIPs: 172.17.0.80 + spec: + type: LoadBalancer ' - name: wait for Placement to start up