Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ spec:
templates:
openstack:
storageClass: local-storage
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
openstack-cell1:
storageClass: local-storage
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
rabbitmq:
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
keystoneEndpoint: default
glanceAPIs:
default:
Expand Down Expand Up @@ -108,11 +108,11 @@ spec:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
ovnController: {}
ovnNorthd:
replicas: 1
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -162,7 +162,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down Expand Up @@ -218,4 +218,4 @@ spec:
designateBackendbind9:
replicas: 1 # backend needs to be configured
storageClass: local-storage
storageRequest: 10G
storageRequest: 10Gi
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
galera:
templates:
openstack:
storageRequest: 500M
storageRequest: 500Mi
rabbitmq:
templates:
rabbitmq:
Expand Down Expand Up @@ -64,7 +64,7 @@ spec:
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
keystoneEndpoint: default
glanceAPIs:
default:
Expand All @@ -88,11 +88,11 @@ spec:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
ovnNorthd:
replicas: 1
ovnController: {}
Expand Down Expand Up @@ -130,7 +130,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -148,7 +148,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down
16 changes: 8 additions & 8 deletions config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
galera:
templates:
openstack:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
openstack-cell1:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
rabbitmq:
Expand Down Expand Up @@ -72,7 +72,7 @@ spec:
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
keystoneEndpoint: default
glanceAPIs:
default:
Expand Down Expand Up @@ -106,11 +106,11 @@ spec:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
ovnNorthd:
replicas: 1
ovnController: {}
Expand Down Expand Up @@ -159,7 +159,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -177,7 +177,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down Expand Up @@ -249,6 +249,6 @@ spec:
designateBackendbind9:
replicas: 1
storageClass: local-storage
storageRequest: 10G
storageRequest: 10Gi
networkAttachments:
- designate
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
galera:
templates:
openstack:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 3
openstack-cell1:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 3
rabbitmq:
Expand Down Expand Up @@ -71,7 +71,7 @@ spec:
databaseInstance: openstack
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
secret: osp-secret
keystoneEndpoint: default
glanceAPIs:
Expand Down Expand Up @@ -106,11 +106,11 @@ spec:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
ovnNorthd:
replicas: 1
ovnController: {}
Expand Down Expand Up @@ -149,7 +149,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -167,7 +167,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down Expand Up @@ -234,7 +234,7 @@ spec:
designateBackendbind9:
replicas: 1
storageClass: local-storage
storageRequest: 10G
storageRequest: 10Gi
networkAttachments:
- designate
swift:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ spec:
galera:
templates:
openstack:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
openstack-cell1:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
rabbitmq:
Expand Down Expand Up @@ -68,7 +68,7 @@ spec:
swift_store_key = {{ .ServicePassword }}
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
keystoneEndpoint: default
glanceAPIs:
default:
Expand Down Expand Up @@ -102,11 +102,11 @@ spec:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
ovnNorthd:
replicas: 1
ovnController: {}
Expand Down Expand Up @@ -153,7 +153,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -171,7 +171,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down Expand Up @@ -239,6 +239,6 @@ spec:
designateBackendbind9:
replicas: 1
storageClass: local-storage
storageRequest: 10G
storageRequest: 10Gi
networkAttachments:
- designate
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
databaseInstance: openstack
storage:
storageClass: ""
storageRequest: 10G
storageRequest: 10Gi
secret: osp-secret
keystoneEndpoint: default
glanceAPIs:
Expand Down Expand Up @@ -108,11 +108,11 @@ spec:
galera:
templates:
openstack:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
openstack-cell1:
storageRequest: 500M
storageRequest: 500Mi
secret: osp-secret
replicas: 1
memcached:
Expand Down Expand Up @@ -241,11 +241,11 @@ spec:
ovnDBCluster:
ovndbcluster-nb:
dbType: NB
storageRequest: 10G
storageRequest: 10Gi
networkAttachment: internalapi
ovndbcluster-sb:
dbType: SB
storageRequest: 10G
storageRequest: 10Gi
networkAttachment: internalapi
ovnController:
networkAttachment: tenant
Expand Down Expand Up @@ -326,7 +326,7 @@ spec:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
storageRequest: 10Gi
ironicInspector:
replicas: 1
ironicNeutronAgent:
Expand All @@ -344,7 +344,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 10G
pvcStorageRequest: 10Gi
autoscaling:
enabled: false
aodh:
Expand Down Expand Up @@ -482,6 +482,6 @@ spec:
designateBackendbind9:
replicas: 1
storageClass: local-storage
storageRequest: 10G
storageRequest: 10Gi
networkAttachments:
- designate
Loading
Loading