Skip to content

Commit

Permalink
Update services routes
Browse files Browse the repository at this point in the history 
openstack-k8s-operators/openstack-operator#457

Signed-off-by: Fabricio Aguiar <[email protected]>
  • Loading branch information
@fao89
fao89 committed Sep 29, 2023
1 parent 4d480bf commit e776e53
Show file tree
Hide file tree
Showing 14 changed files with 217 additions and 117 deletions.
42 changes: 25 additions & 17 deletions docs/openstack/backend_services_deployment.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions docs/openstack/cinder_adoption.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions docs/openstack/glance_adoption.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -88,11 +94,6 @@ spec:
storageClass: "local-storage"
storageRequest: 10G
glanceAPIInternal:
externalEndpoints:
- endpoint: internal
ipAddressPool: internalapi
loadBalancerIPs:
- 172.17.0.80
networkAttachments:
- storage
glanceAPIExternal:
Expand Down
17 changes: 12 additions & 5 deletions docs/openstack/helpers/cinder-cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 12 additions & 5 deletions docs/openstack/keystone_adoption.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
```

Expand Down
17 changes: 12 additions & 5 deletions docs/openstack/neutron_adoption.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand Down
17 changes: 12 additions & 5 deletions docs/openstack/placement_adoption.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
```

Expand Down
42 changes: 25 additions & 17 deletions tests/config/base/openstack_control_plane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
41 changes: 25 additions & 16 deletions tests/config/periodic_ci/container_image_overrides.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions tests/roles/cinder_adoption/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit e776e53

Please sign in to comment.