Skip to content

Commit b19d1fe

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1130 from fmount/glance_swift
Update Samples and configure Swift backend for Glance
2 parents 1262ca4 + b7e0084 commit b19d1fe

11 files changed

+159
-9
lines changed

‎config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,24 @@ spec:
5656
template:
5757
secret: osp-secret
5858
databaseInstance: openstack
59+
customServiceConfig: |
60+
[DEFAULT]
61+
enabled_backends = default_backend:swift
62+
[glance_store]
63+
default_backend = default_backend
64+
[default_backend]
65+
swift_store_create_container_on_put = True
66+
swift_store_auth_version = 3
67+
swift_store_auth_address = {{ .KeystoneInternalURL }}
68+
swift_store_endpoint_type = internalURL
69+
swift_store_user = service:glance
70+
swift_store_key = {{ .ServicePassword }}
5971
storage:
6072
storageClass: ""
6173
storageRequest: 10G
6274
keystoneEndpoint: default
6375
glanceAPIs:
6476
default:
65-
type: single
6677
replicas: 1
6778
cinder:
6879
template:

‎config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,25 @@ spec:
4646
template:
4747
secret: osp-secret
4848
databaseInstance: openstack
49+
customServiceConfig: |
50+
[DEFAULT]
51+
enabled_backends = default_backend:swift
52+
[glance_store]
53+
default_backend = default_backend
54+
[default_backend]
55+
swift_store_create_container_on_put = True
56+
swift_store_auth_version = 3
57+
swift_store_auth_address = {{ .KeystoneInternalURL }}
58+
swift_store_endpoint_type = internalURL
59+
swift_store_user = service:glance
60+
swift_store_key = {{ .ServicePassword }}
4961
storage:
5062
storageClass: ""
5163
storageRequest: 10G
5264
keystoneEndpoint: default
5365
glanceAPIs:
5466
default:
5567
replicas: 1
56-
type: single
5768
cinder:
5869
template:
5970
databaseInstance: openstack
@@ -149,3 +160,12 @@ spec:
149160
ipaddr: 172.17.0.80
150161
port: 10514
151162
cloNamespace: openshift-logging
163+
swift:
164+
enabled: true
165+
template:
166+
swiftRing:
167+
ringReplicas: 1
168+
swiftStorage:
169+
replicas: 1
170+
swiftProxy:
171+
replicas: 1

‎config/samples/core_v1beta1_openstackcontrolplane_galera.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,24 @@ spec:
5454
template:
5555
secret: osp-secret
5656
databaseInstance: openstack
57+
customServiceConfig: |
58+
[DEFAULT]
59+
enabled_backends = default_backend:swift
60+
[glance_store]
61+
default_backend = default_backend
62+
[default_backend]
63+
swift_store_create_container_on_put = True
64+
swift_store_auth_version = 3
65+
swift_store_auth_address = {{ .KeystoneInternalURL }}
66+
swift_store_endpoint_type = internalURL
67+
swift_store_user = service:glance
68+
swift_store_key = {{ .ServicePassword }}
5769
storage:
5870
storageClass: ""
5971
storageRequest: 10G
6072
keystoneEndpoint: default
6173
glanceAPIs:
6274
default:
63-
type: single
6475
replicas: 1
6576
cinder:
6677
template:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ spec:
5252
secret: osp-secret
5353
glance:
5454
template:
55+
customServiceConfig: |
56+
[DEFAULT]
57+
enabled_backends = default_backend:swift
58+
[glance_store]
59+
default_backend = default_backend
60+
[default_backend]
61+
swift_store_create_container_on_put = True
62+
swift_store_auth_version = 3
63+
swift_store_auth_address = {{ .KeystoneInternalURL }}
64+
swift_store_endpoint_type = internalURL
65+
swift_store_user = service:glance
66+
swift_store_key = {{ .ServicePassword }}
5567
databaseInstance: openstack
5668
storage:
5769
storageClass: ""
@@ -61,7 +73,6 @@ spec:
6173
glanceAPIs:
6274
default:
6375
replicas: 1
64-
type: single
6576
cinder:
6677
template:
6778
databaseInstance: openstack
@@ -213,3 +224,11 @@ spec:
213224
replicas: 0
214225
networkAttachments:
215226
- designate
227+
swift:
228+
template:
229+
swiftRing:
230+
ringReplicas: 1
231+
swiftStorage:
232+
replicas: 1
233+
swiftProxy:
234+
replicas: 1

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@ spec:
5454
default:
5555
route: {}
5656
template:
57+
customServiceConfig: |
58+
[DEFAULT]
59+
enabled_backends = default_backend:swift
60+
[glance_store]
61+
default_backend = default_backend
62+
[default_backend]
63+
swift_store_create_container_on_put = True
64+
swift_store_auth_version = 3
65+
swift_store_auth_address = {{ .KeystoneInternalURL }}
66+
swift_store_endpoint_type = internalURL
67+
swift_store_user = service:glance
68+
swift_store_key = {{ .ServicePassword }}
5769
databaseInstance: openstack
5870
storage:
5971
storageClass: ""
@@ -62,7 +74,6 @@ spec:
6274
keystoneEndpoint: default
6375
glanceAPIs:
6476
default:
65-
type: single
6677
replicas: 1
6778
override:
6879
service:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,25 @@ spec:
7777
route: {}
7878
template:
7979
databaseInstance: openstack
80+
customServiceConfig: |
81+
[DEFAULT]
82+
enabled_backends = default_backend:swift
83+
[glance_store]
84+
default_backend = default_backend
85+
[default_backend]
86+
swift_store_create_container_on_put = True
87+
swift_store_auth_version = 3
88+
swift_store_auth_address = {{ .KeystoneInternalURL }}
89+
swift_store_endpoint_type = internalURL
90+
swift_store_user = service:glance
91+
swift_store_key = {{ .ServicePassword }}
8092
storage:
8193
storageClass: ""
8294
storageRequest: 10G
8395
secret: osp-secret
8496
keystoneEndpoint: default
8597
glanceAPIs:
8698
default:
87-
type: single
8899
replicas: 1
89100
override:
90101
service:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,25 @@ spec:
7777
route: {}
7878
template:
7979
databaseInstance: openstack
80+
customServiceConfig: |
81+
[DEFAULT]
82+
enabled_backends = default_backend:swift
83+
[glance_store]
84+
default_backend = default_backend
85+
[default_backend]
86+
swift_store_create_container_on_put = True
87+
swift_store_auth_version = 3
88+
swift_store_auth_address = {{ .KeystoneInternalURL }}
89+
swift_store_endpoint_type = internalURL
90+
swift_store_user = service:glance
91+
swift_store_key = {{ .ServicePassword }}
8092
storage:
8193
storageClass: ""
8294
storageRequest: 10G
8395
secret: osp-secret
8496
keystoneEndpoint: default
8597
glanceAPIs:
8698
default:
87-
type: single
8899
replicas: 1
89100
override:
90101
service:

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,25 @@ spec:
7777
route: {}
7878
template:
7979
databaseInstance: openstack
80+
customServiceConfig: |
81+
[DEFAULT]
82+
enabled_backends = default_backend:swift
83+
[glance_store]
84+
default_backend = default_backend
85+
[default_backend]
86+
swift_store_create_container_on_put = True
87+
swift_store_auth_version = 3
88+
swift_store_auth_address = {{ .KeystoneInternalURL }}
89+
swift_store_endpoint_type = internalURL
90+
swift_store_user = service:glance
91+
swift_store_key = {{ .ServicePassword }}
8092
storage:
8193
storageClass: ""
8294
storageRequest: 10G
8395
secret: osp-secret
8496
keystoneEndpoint: default
8597
glanceAPIs:
8698
default:
87-
type: single
8899
replicas: 1
89100
override:
90101
service:

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,20 @@ spec:
8585
storageRequest: 10G
8686
secret: osp-secret
8787
keystoneEndpoint: default
88+
customServiceConfig: |
89+
[DEFAULT]
90+
enabled_backends = default_backend:swift
91+
[glance_store]
92+
default_backend = default_backend
93+
[default_backend]
94+
swift_store_create_container_on_put = True
95+
swift_store_auth_version = 3
96+
swift_store_auth_address = {{ .KeystoneInternalURL }}
97+
swift_store_endpoint_type = internalURL
98+
swift_store_user = service:glance
99+
swift_store_key = {{ .ServicePassword }}
88100
glanceAPIs:
89101
default:
90-
type: single
91102
replicas: 1
92103
override:
93104
service:

‎tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ spec:
125125
replicas: 1
126126
barbicanKeystoneListener:
127127
replicas: 1
128+
swift:
129+
enabled: true
130+
template:
131+
swiftRing:
132+
ringReplicas: 1
133+
swiftStorage:
134+
replicas: 1
135+
swiftProxy:
136+
replicas: 1
128137
tls:
129138
ingress:
130139
ca:
@@ -199,6 +208,10 @@ status:
199208
reason: Ready
200209
status: "True"
201210
type: OpenStackControlPlaneExposePlacementAPIReady
211+
- message: OpenStackControlPlane swift service exposed
212+
reason: Ready
213+
status: "True"
214+
type: OpenStackControlPlaneExposeSwiftReady
202215
- message: OpenStackControlPlane Glance completed
203216
reason: Ready
204217
status: "True"
@@ -239,6 +252,10 @@ status:
239252
reason: Ready
240253
status: "True"
241254
type: OpenStackControlPlaneRabbitMQReady
255+
- message: OpenStackControlPlane Swift completed
256+
reason: Ready
257+
status: "True"
258+
type: OpenStackControlPlaneSwiftReady
242259
- message: OpenStackControlPlane Telemetry completed
243260
reason: Ready
244261
status: "True"

‎tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ spec:
152152
duration: 87600h0m0s
153153
cert:
154154
duration: 43800h0m0s
155+
swift:
156+
enabled: true
157+
template:
158+
swiftRing:
159+
ringReplicas: 1
160+
swiftStorage:
161+
replicas: 1
162+
swiftProxy:
163+
replicas: 1
155164
status:
156165
conditions:
157166
- message: Setup complete
@@ -202,6 +211,10 @@ status:
202211
reason: Ready
203212
status: "True"
204213
type: OpenStackControlPlaneExposePlacementAPIReady
214+
- message: OpenStackControlPlane swift service exposed
215+
reason: Ready
216+
status: "True"
217+
type: OpenStackControlPlaneExposeSwiftReady
205218
- message: OpenStackControlPlane Glance completed
206219
reason: Ready
207220
status: "True"
@@ -242,6 +255,10 @@ status:
242255
reason: Ready
243256
status: "True"
244257
type: OpenStackControlPlaneRabbitMQReady
258+
- message: OpenStackControlPlane Swift completed
259+
reason: Ready
260+
status: "True"
261+
type: OpenStackControlPlaneSwiftReady
245262
- message: OpenStackControlPlane Telemetry completed
246263
reason: Ready
247264
status: "True"

0 commit comments

Comments
 (0)