Skip to content

Commit 1fe77b3

Browse files
Maxim Savamaximsava12
authored andcommitted
Switch uni-deltas job to use S3 API from Ceph
Glance/RBD is already covered by uni-gamma, so uni-delta could be changed to test glance/S3 instead, using the S3 API provided by ceph. https://issues.redhat.com/browse/OSPRH-11411
1 parent feaa133 commit 1fe77b3

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

examples/dt/uni04delta-ipv6/control-plane/service-values.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@ data:
3535
customServiceConfig: |
3636
[DEFAULT]
3737
debug = True
38-
enabled_backends = default_backend:rbd
38+
enabled_backends = default_backend:s3
3939
4040
[glance_store]
4141
default_backend = default_backend
4242
4343
[default_backend]
44-
rbd_store_ceph_conf = /etc/ceph/ceph.conf
45-
store_description = "RBD backend"
46-
rbd_store_pool = images
47-
rbd_store_user = openstack
44+
s3_store_create_bucket_on_put = True
45+
s3_store_bucket_url_format = "path"
46+
s3_store_cacert = "/etc/pki/tls/certs/ca-bundle.crt"
47+
customServiceConfigSecrets:
48+
- s3glance
4849
glanceAPIs:
4950
default:
5051
replicas: 3

examples/dt/uni04delta/control-plane/service-values.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,18 @@ data:
7070
glance:
7171
customServiceConfig: |
7272
[DEFAULT]
73-
debug = True
74-
enabled_backends = default_backend:rbd
75-
73+
debug=true
74+
enabled_backends = default_backend:s3
7675
[glance_store]
7776
default_backend = default_backend
78-
7977
[default_backend]
80-
rbd_store_ceph_conf = /etc/ceph/ceph.conf
81-
store_description = "RBD backend"
82-
rbd_store_pool = images
83-
rbd_store_user = openstack
78+
s3_store_create_bucket_on_put = True
79+
s3_store_bucket_url_format = "path"
8480
glanceAPIs:
8581
default:
8682
replicas: 3
83+
customServiceConfigSecrets:
84+
- s3glance
8785

8886
manila:
8987
enabled: true

examples/dt/uni04delta/kustomization.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,23 @@ kind: Kustomization
44

55
components:
66
- ../../../dt/uni04delta/edpm/nodeset
7+
# - ../../../lib/control-plane
78

89
resources:
910
- control-plane/networking/nncp/values.yaml
1011
- control-plane/service-values.yaml
1112
- values.yaml
13+
14+
replacements:
15+
# Glance
16+
- source:
17+
kind: ConfigMap
18+
name: service-values
19+
fieldPath: data.glance.glanceAPIs.default.customServiceConfigSecrets
20+
targets:
21+
- select:
22+
kind: OpenStackControlPlane
23+
fieldPaths:
24+
- spec.glance.template.glanceAPIs.default.customServiceConfigSecrets
25+
options:
26+
create: true

0 commit comments

Comments
 (0)