Skip to content

Commit a9645a5

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 c8fcb00 commit a9645a5

File tree

9 files changed

+109
-13
lines changed

9 files changed

+109
-13
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Define the "S3 glance backend" Secret that contains sensitive
3+
# information pertaining to the [S3] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: glance
9+
name: s3glance
10+
type: Opaque
11+
stringData:
12+
s3glance.conf: _replaced_

dt/uni04delta-ipv6/kustomization.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ transformers:
1919
components:
2020
- control-plane
2121

22+
resources:
23+
- glance-s3-backend-secrets.yaml
24+
2225
replacements:
2326
- source:
2427
kind: ConfigMap
@@ -91,3 +94,16 @@ replacements:
9194
- spec.keystone.template.customServiceConfig
9295
options:
9396
create: true
97+
98+
- source:
99+
kind: ConfigMap
100+
name: service-values
101+
fieldPath: data.s3glance\.conf
102+
targets:
103+
- select:
104+
kind: Secret
105+
name: s3glance
106+
fieldPaths:
107+
- stringData.s3glance\.conf
108+
options:
109+
create: true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Define the "s3glance" Secret that contains sensitive
3+
# information pertaining to the [s3] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: glance
9+
name: s3glance
10+
type: Opaque
11+
stringData:
12+
s3glance.conf: _replaced_

dt/uni04delta/kustomization.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,20 @@ transformers:
1818
1919
components:
2020
- ../../lib/control-plane
21+
22+
resources:
23+
- glance-s3-backend-secrets.yaml
24+
25+
replacements:
26+
- source:
27+
kind: ConfigMap
28+
name: service-values
29+
fieldPath: data.s3glance\.conf
30+
targets:
31+
- select:
32+
kind: Secret
33+
name: s3glance
34+
fieldPaths:
35+
- stringData.s3glance\.conf
36+
options:
37+
create: true

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,28 @@ 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+
customServiceConfigSecrets:
47+
- s3glance
4848
glanceAPIs:
4949
default:
5050
replicas: 3
5151

52+
s3glance.conf : |
53+
[default_backend]
54+
s3_store_host = _replaced_
55+
s3_store_access_key = _replaced_
56+
s3_store_secret_key = _replaced_
57+
s3_store_bucket = _replaced_
58+
s3_store_cacert = _replaced_
59+
5260
keystone:
5361
customServiceConfig: |
5462
[token]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Define the "S3 glance backend" Secret that contains sensitive
3+
# information pertaining to the [S3] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: glance
9+
name: s3glance
10+
type: Opaque
11+
stringData:
12+
s3glance.conf: _replaced_

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,27 @@ 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"
80+
customServiceConfigSecrets:
81+
- s3glance
8482
glanceAPIs:
8583
default:
8684
replicas: 3
8785

86+
s3glance.conf: |
87+
[default_backend]
88+
s3_store_host = _replaced_
89+
s3_store_access_key = _replaced_
90+
s3_store_secret_key = _replaced_
91+
s3_store_bucket = _replaced_
92+
s3_store_cacert = _replaced_
93+
8894
manila:
8995
enabled: true
9096
customServiceConfig: |
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
# Define the "s3glance" Secret that contains sensitive
3+
# information pertaining to the [s3] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: glance
9+
name: s3glance
10+
type: Opaque
11+
stringData:
12+
s3glance.conf: _replaced_

examples/dt/uni04delta/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ resources:
99
- control-plane/networking/nncp/values.yaml
1010
- control-plane/service-values.yaml
1111
- values.yaml
12+
- glance-s3-backend-secrets.yaml

0 commit comments

Comments
 (0)