Skip to content

Commit 36856d2

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1856 from jhanzlic/unit_type_change
Storage request unit changes from M/G to Mi/Gi
2 parents 181f852 + 37be192 commit 36856d2

20 files changed

Lines changed: 139 additions & 139 deletions

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ spec:
1515
templates:
1616
openstack:
1717
storageClass: local-storage
18-
storageRequest: 500M
18+
storageRequest: 500Mi
1919
secret: osp-secret
2020
replicas: 1
2121
openstack-cell1:
2222
storageClass: local-storage
23-
storageRequest: 500M
23+
storageRequest: 500Mi
2424
secret: osp-secret
2525
replicas: 1
2626
rabbitmq:
@@ -74,7 +74,7 @@ spec:
7474
swift_store_key = {{ .ServicePassword }}
7575
storage:
7676
storageClass: ""
77-
storageRequest: 10G
77+
storageRequest: 10Gi
7878
keystoneEndpoint: default
7979
glanceAPIs:
8080
default:
@@ -108,11 +108,11 @@ spec:
108108
ovndbcluster-nb:
109109
replicas: 1
110110
dbType: NB
111-
storageRequest: 10G
111+
storageRequest: 10Gi
112112
ovndbcluster-sb:
113113
replicas: 1
114114
dbType: SB
115-
storageRequest: 10G
115+
storageRequest: 10Gi
116116
ovnController: {}
117117
ovnNorthd:
118118
replicas: 1
@@ -144,7 +144,7 @@ spec:
144144
replicas: 1
145145
ironicConductors:
146146
- replicas: 1
147-
storageRequest: 10G
147+
storageRequest: 10Gi
148148
ironicInspector:
149149
replicas: 1
150150
ironicNeutronAgent:
@@ -162,7 +162,7 @@ spec:
162162
strategy: persistent
163163
retention: 24h
164164
persistent:
165-
pvcStorageRequest: 10G
165+
pvcStorageRequest: 10Gi
166166
autoscaling:
167167
enabled: false
168168
aodh:
@@ -218,4 +218,4 @@ spec:
218218
designateBackendbind9:
219219
replicas: 1 # backend needs to be configured
220220
storageClass: local-storage
221-
storageRequest: 10G
221+
storageRequest: 10Gi

‎config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
galera:
1515
templates:
1616
openstack:
17-
storageRequest: 500M
17+
storageRequest: 500Mi
1818
rabbitmq:
1919
templates:
2020
rabbitmq:
@@ -64,7 +64,7 @@ spec:
6464
swift_store_key = {{ .ServicePassword }}
6565
storage:
6666
storageClass: ""
67-
storageRequest: 10G
67+
storageRequest: 10Gi
6868
keystoneEndpoint: default
6969
glanceAPIs:
7070
default:
@@ -88,11 +88,11 @@ spec:
8888
ovndbcluster-nb:
8989
replicas: 1
9090
dbType: NB
91-
storageRequest: 10G
91+
storageRequest: 10Gi
9292
ovndbcluster-sb:
9393
replicas: 1
9494
dbType: SB
95-
storageRequest: 10G
95+
storageRequest: 10Gi
9696
ovnNorthd:
9797
replicas: 1
9898
ovnController: {}
@@ -130,7 +130,7 @@ spec:
130130
replicas: 1
131131
ironicConductors:
132132
- replicas: 1
133-
storageRequest: 10G
133+
storageRequest: 10Gi
134134
ironicInspector:
135135
replicas: 1
136136
ironicNeutronAgent:
@@ -148,7 +148,7 @@ spec:
148148
strategy: persistent
149149
retention: 24h
150150
persistent:
151-
pvcStorageRequest: 10G
151+
pvcStorageRequest: 10Gi
152152
autoscaling:
153153
enabled: false
154154
aodh:

‎config/samples/core_v1beta1_openstackcontrolplane_galera.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ spec:
1414
galera:
1515
templates:
1616
openstack:
17-
storageRequest: 500M
17+
storageRequest: 500Mi
1818
secret: osp-secret
1919
replicas: 1
2020
openstack-cell1:
21-
storageRequest: 500M
21+
storageRequest: 500Mi
2222
secret: osp-secret
2323
replicas: 1
2424
rabbitmq:
@@ -72,7 +72,7 @@ spec:
7272
swift_store_key = {{ .ServicePassword }}
7373
storage:
7474
storageClass: ""
75-
storageRequest: 10G
75+
storageRequest: 10Gi
7676
keystoneEndpoint: default
7777
glanceAPIs:
7878
default:
@@ -106,11 +106,11 @@ spec:
106106
ovndbcluster-nb:
107107
replicas: 1
108108
dbType: NB
109-
storageRequest: 10G
109+
storageRequest: 10Gi
110110
ovndbcluster-sb:
111111
replicas: 1
112112
dbType: SB
113-
storageRequest: 10G
113+
storageRequest: 10Gi
114114
ovnNorthd:
115115
replicas: 1
116116
ovnController: {}
@@ -159,7 +159,7 @@ spec:
159159
replicas: 1
160160
ironicConductors:
161161
- replicas: 1
162-
storageRequest: 10G
162+
storageRequest: 10Gi
163163
ironicInspector:
164164
replicas: 1
165165
ironicNeutronAgent:
@@ -177,7 +177,7 @@ spec:
177177
strategy: persistent
178178
retention: 24h
179179
persistent:
180-
pvcStorageRequest: 10G
180+
pvcStorageRequest: 10Gi
181181
autoscaling:
182182
enabled: false
183183
aodh:
@@ -249,6 +249,6 @@ spec:
249249
designateBackendbind9:
250250
replicas: 1
251251
storageClass: local-storage
252-
storageRequest: 10G
252+
storageRequest: 10Gi
253253
networkAttachments:
254254
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ spec:
1414
galera:
1515
templates:
1616
openstack:
17-
storageRequest: 500M
17+
storageRequest: 500Mi
1818
secret: osp-secret
1919
replicas: 3
2020
openstack-cell1:
21-
storageRequest: 500M
21+
storageRequest: 500Mi
2222
secret: osp-secret
2323
replicas: 3
2424
rabbitmq:
@@ -71,7 +71,7 @@ spec:
7171
databaseInstance: openstack
7272
storage:
7373
storageClass: ""
74-
storageRequest: 10G
74+
storageRequest: 10Gi
7575
secret: osp-secret
7676
keystoneEndpoint: default
7777
glanceAPIs:
@@ -106,11 +106,11 @@ spec:
106106
ovndbcluster-nb:
107107
replicas: 1
108108
dbType: NB
109-
storageRequest: 10G
109+
storageRequest: 10Gi
110110
ovndbcluster-sb:
111111
replicas: 1
112112
dbType: SB
113-
storageRequest: 10G
113+
storageRequest: 10Gi
114114
ovnNorthd:
115115
replicas: 1
116116
ovnController: {}
@@ -149,7 +149,7 @@ spec:
149149
replicas: 1
150150
ironicConductors:
151151
- replicas: 1
152-
storageRequest: 10G
152+
storageRequest: 10Gi
153153
ironicInspector:
154154
replicas: 1
155155
ironicNeutronAgent:
@@ -167,7 +167,7 @@ spec:
167167
strategy: persistent
168168
retention: 24h
169169
persistent:
170-
pvcStorageRequest: 10G
170+
pvcStorageRequest: 10Gi
171171
autoscaling:
172172
enabled: false
173173
aodh:
@@ -234,7 +234,7 @@ spec:
234234
designateBackendbind9:
235235
replicas: 1
236236
storageClass: local-storage
237-
storageRequest: 10G
237+
storageRequest: 10Gi
238238
networkAttachments:
239239
- designate
240240
swift:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_fr1.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ spec:
1212
galera:
1313
templates:
1414
openstack:
15-
storageRequest: 500M
15+
storageRequest: 500Mi
1616
secret: osp-secret
1717
replicas: 1
1818
openstack-cell1:
19-
storageRequest: 500M
19+
storageRequest: 500Mi
2020
secret: osp-secret
2121
replicas: 1
2222
rabbitmq:
@@ -68,7 +68,7 @@ spec:
6868
swift_store_key = {{ .ServicePassword }}
6969
storage:
7070
storageClass: ""
71-
storageRequest: 10G
71+
storageRequest: 10Gi
7272
keystoneEndpoint: default
7373
glanceAPIs:
7474
default:
@@ -102,11 +102,11 @@ spec:
102102
ovndbcluster-nb:
103103
replicas: 1
104104
dbType: NB
105-
storageRequest: 10G
105+
storageRequest: 10Gi
106106
ovndbcluster-sb:
107107
replicas: 1
108108
dbType: SB
109-
storageRequest: 10G
109+
storageRequest: 10Gi
110110
ovnNorthd:
111111
replicas: 1
112112
ovnController: {}
@@ -153,7 +153,7 @@ spec:
153153
replicas: 1
154154
ironicConductors:
155155
- replicas: 1
156-
storageRequest: 10G
156+
storageRequest: 10Gi
157157
ironicInspector:
158158
replicas: 1
159159
ironicNeutronAgent:
@@ -171,7 +171,7 @@ spec:
171171
strategy: persistent
172172
retention: 24h
173173
persistent:
174-
pvcStorageRequest: 10G
174+
pvcStorageRequest: 10Gi
175175
autoscaling:
176176
enabled: false
177177
aodh:
@@ -239,6 +239,6 @@ spec:
239239
designateBackendbind9:
240240
replicas: 1
241241
storageClass: local-storage
242-
storageRequest: 10G
242+
storageRequest: 10Gi
243243
networkAttachments:
244244
- designate

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ spec:
6969
databaseInstance: openstack
7070
storage:
7171
storageClass: ""
72-
storageRequest: 10G
72+
storageRequest: 10Gi
7373
secret: osp-secret
7474
keystoneEndpoint: default
7575
glanceAPIs:
@@ -108,11 +108,11 @@ spec:
108108
galera:
109109
templates:
110110
openstack:
111-
storageRequest: 500M
111+
storageRequest: 500Mi
112112
secret: osp-secret
113113
replicas: 1
114114
openstack-cell1:
115-
storageRequest: 500M
115+
storageRequest: 500Mi
116116
secret: osp-secret
117117
replicas: 1
118118
memcached:
@@ -241,11 +241,11 @@ spec:
241241
ovnDBCluster:
242242
ovndbcluster-nb:
243243
dbType: NB
244-
storageRequest: 10G
244+
storageRequest: 10Gi
245245
networkAttachment: internalapi
246246
ovndbcluster-sb:
247247
dbType: SB
248-
storageRequest: 10G
248+
storageRequest: 10Gi
249249
networkAttachment: internalapi
250250
ovnController:
251251
networkAttachment: tenant
@@ -326,7 +326,7 @@ spec:
326326
replicas: 1
327327
ironicConductors:
328328
- replicas: 1
329-
storageRequest: 10G
329+
storageRequest: 10Gi
330330
ironicInspector:
331331
replicas: 1
332332
ironicNeutronAgent:
@@ -344,7 +344,7 @@ spec:
344344
strategy: persistent
345345
retention: 24h
346346
persistent:
347-
pvcStorageRequest: 10G
347+
pvcStorageRequest: 10Gi
348348
autoscaling:
349349
enabled: false
350350
aodh:
@@ -482,6 +482,6 @@ spec:
482482
designateBackendbind9:
483483
replicas: 1
484484
storageClass: local-storage
485-
storageRequest: 10G
485+
storageRequest: 10Gi
486486
networkAttachments:
487487
- designate

0 commit comments

Comments
 (0)