Skip to content

Update Samples and configure Swift backend for Glance #1130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
+159 −9
Merged

Update Samples and configure Swift backend for Glance #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,24 @@ spec:
template:
secret: osp-secret
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
cinder:
template:
Expand Down
22 changes: 21 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,25 @@ spec:
template:
secret: osp-secret
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
keystoneEndpoint: default
glanceAPIs:
default:
replicas: 1
type: single
cinder:
template:
databaseInstance: openstack
Expand Down Expand Up @@ -149,3 +160,12 @@ spec:
ipaddr: 172.17.0.80
port: 10514
cloNamespace: openshift-logging
swift:
enabled: true
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
13 changes: 12 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,24 @@ spec:
template:
secret: osp-secret
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
cinder:
template:
Expand Down
21 changes: 20 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ spec:
secret: osp-secret
glance:
template:
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
databaseInstance: openstack
storage:
storageClass: ""
Expand All @@ -61,7 +73,6 @@ spec:
glanceAPIs:
default:
replicas: 1
type: single
cinder:
template:
databaseInstance: openstack
Expand Down Expand Up @@ -213,3 +224,11 @@ spec:
replicas: 0
networkAttachments:
- designate
swift:
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
13 changes: 12 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ spec:
default:
route: {}
template:
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
databaseInstance: openstack
storage:
storageClass: ""
Expand All @@ -62,7 +74,6 @@ spec:
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
override:
service:
Expand Down
13 changes: 12 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,25 @@ spec:
route: {}
template:
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
secret: osp-secret
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
override:
service:
Expand Down
13 changes: 12 additions & 1 deletion ...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,25 @@ spec:
route: {}
template:
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
secret: osp-secret
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
override:
service:
Expand Down
13 changes: 12 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,25 @@ spec:
route: {}
template:
databaseInstance: openstack
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
secret: osp-secret
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
override:
service:
Expand Down
13 changes: 12 additions & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,20 @@ spec:
storageRequest: 10G
secret: osp-secret
keystoneEndpoint: default
customServiceConfig: |
[DEFAULT]
enabled_backends = default_backend:swift
[glance_store]
default_backend = default_backend
[default_backend]
swift_store_create_container_on_put = True
swift_store_auth_version = 3
swift_store_auth_address = {{ .KeystoneInternalURL }}
swift_store_endpoint_type = internalURL
swift_store_user = service:glance
swift_store_key = {{ .ServicePassword }}
glanceAPIs:
default:
type: single
replicas: 1
override:
service:
Expand Down
17 changes: 17 additions & 0 deletions tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,15 @@ spec:
replicas: 1
barbicanKeystoneListener:
replicas: 1
swift:
enabled: true
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
tls:
ingress:
ca:
Expand Down Expand Up @@ -199,6 +208,10 @@ status:
reason: Ready
status: "True"
type: OpenStackControlPlaneExposePlacementAPIReady
- message: OpenStackControlPlane swift service exposed
reason: Ready
status: "True"
type: OpenStackControlPlaneExposeSwiftReady
- message: OpenStackControlPlane Glance completed
reason: Ready
status: "True"
Expand Down Expand Up @@ -239,6 +252,10 @@ status:
reason: Ready
status: "True"
type: OpenStackControlPlaneRabbitMQReady
- message: OpenStackControlPlane Swift completed
reason: Ready
status: "True"
type: OpenStackControlPlaneSwiftReady
- message: OpenStackControlPlane Telemetry completed
reason: Ready
status: "True"
Expand Down
17 changes: 17 additions & 0 deletions tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,15 @@ spec:
duration: 87600h0m0s
cert:
duration: 43800h0m0s
swift:
enabled: true
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
status:
conditions:
- message: Setup complete
Expand Down Expand Up @@ -202,6 +211,10 @@ status:
reason: Ready
status: "True"
type: OpenStackControlPlaneExposePlacementAPIReady
- message: OpenStackControlPlane swift service exposed
reason: Ready
status: "True"
type: OpenStackControlPlaneExposeSwiftReady
- message: OpenStackControlPlane Glance completed
reason: Ready
status: "True"
Expand Down Expand Up @@ -242,6 +255,10 @@ status:
reason: Ready
status: "True"
type: OpenStackControlPlaneRabbitMQReady
- message: OpenStackControlPlane Swift completed
reason: Ready
status: "True"
type: OpenStackControlPlaneSwiftReady
- message: OpenStackControlPlane Telemetry completed
reason: Ready
status: "True"
Expand Down
Loading