Skip to content

Commit

Permalink
Merge pull request #317 from fmount/fix_samples
Browse files Browse the repository at this point in the history
Fix samples and backends
  • Loading branch information
openshift-merge-robot authored Sep 18, 2023
2 parents 5746941 + 932ffb5 commit 8ff43c2
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 6 deletions.
146 changes: 146 additions & 0 deletions config/samples/backends/base/openstack/openstack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
# Modified version of https://github.com/openstack-k8s-operators/openstack-operator/blob/main/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
# with some changes relevant for Glance
apiVersion: core.openstack.org/v1beta1
kind: OpenStackControlPlane
metadata:
name: openstack
spec:
secret: osp-secret
storageClass: local-storage
keystone:
template:
databaseInstance: openstack
secret: osp-secret
mariadb:
enabled: false
templates:
openstack:
storageRequest: 500M
openstack-cell1:
storageRequest: 500M
galera:
enabled: true
templates:
openstack:
storageRequest: 500M
secret: osp-secret
replicas: 1
openstack-cell1:
storageRequest: 500M
secret: osp-secret
replicas: 1
rabbitmq:
templates:
rabbitmq:
replicas: 1
rabbitmq-cell1:
replicas: 1
memcached:
templates:
memcached:
replicas: 1
placement:
template:
databaseInstance: openstack
secret: osp-secret
glance:
template:
databaseInstance: openstack
storageClass: ""
storageRequest: 10G
cinder:
template:
databaseInstance: openstack
secret: osp-secret
cinderAPI:
replicas: 1
cinderScheduler:
replicas: 1
cinderBackup:
replicas: 0 # backend needs to be configured
cinderVolumes:
volume1:
replicas: 0 # backend needs to be configured
manila:
template:
manilaAPI:
replicas: 1
manilaScheduler:
replicas: 1
manilaShares:
share1:
replicas: 1
ovn:
template:
ovnDBCluster:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
ovnNorthd:
replicas: 1
ovnController:
external-ids:
system-id: "random"
ovn-bridge: "br-int"
ovn-encap-type: "geneve"
neutron:
template:
databaseInstance: openstack
secret: osp-secret
horizon:
template:
replicas: 1
secret: osp-secret
nova:
template:
secret: osp-secret
heat:
enabled: false
template:
databaseInstance: openstack
heatAPI:
replicas: 1
heatEngine:
replicas: 1
secret: osp-secret
ironic:
enabled: false
template:
databaseInstance: openstack
ironicAPI:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
ironicInspector:
replicas: 1
ironicNeutronAgent:
replicas: 1
secret: osp-secret
ceilometer:
template:
passwordSelector:
service: CeilometerPassword
secret: osp-secret
serviceUser: ceilometer
swift:
enabled: true
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
octavia:
enabled: false
template:
databaseInstance: openstack
octaviaAPI:
replicas: 1
secret: osp-secret
File renamed without changes.
6 changes: 4 additions & 2 deletions config/samples/backends/ceph/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Append samples you want in your CSV to this file as resources ##
resources:
- ceph.yaml
- ../base/openstack

patches:
- ceph.yaml
6 changes: 4 additions & 2 deletions config/samples/backends/multibackends/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Append samples you want in your CSV to this file as resources ##
resources:
- multibackends.yaml
- ../base/openstack

patches:
- multibackend.yaml
6 changes: 4 additions & 2 deletions config/samples/backends/nfs/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## Append samples you want in your CSV to this file as resources ##
resources:
- nfs.yaml
- ../base/openstack

patches:
- nfs.yaml
File renamed without changes.

0 comments on commit 8ff43c2

Please sign in to comment.