diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml index 0c8dbcab..f085e468 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane.yaml @@ -15,6 +15,9 @@ spec: openstack: containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo storageRequest: 500M + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageRequest: 500M galera: enabled: false templates: @@ -24,6 +27,12 @@ spec: storageRequest: 500M secret: osp-secret replicas: 1 + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageClass: local-storage + storageRequest: 500M + secret: osp-secret + replicas: 1 rabbitmq: templates: rabbitmq: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml index 72a2f2b0..d48c3dd4 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -109,6 +109,8 @@ spec: hasAPIAccess: true cell1: cellDatabaseUser: nova_cell1 + cellDatabaseInstance: openstack + cellMessageBusInstance: rabbitmq conductorServiceTemplate: replicas: 1 hasAPIAccess: true diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index 2b478911..42e276d3 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -16,6 +16,9 @@ spec: openstack: containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo storageRequest: 500M + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageRequest: 500M galera: enabled: true templates: @@ -25,6 +28,12 @@ spec: storageRequest: 500M secret: osp-secret replicas: 1 + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageClass: local-storage + storageRequest: 500M + secret: osp-secret + replicas: 1 rabbitmq: templates: rabbitmq: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 68656535..22029b3e 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -63,6 +63,9 @@ spec: openstack: containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo storageRequest: 500M + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageRequest: 500M memcached: enabled: true templates: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 9e4a9c56..1cc7f46d 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -107,6 +107,9 @@ spec: openstack: containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo storageRequest: 500M + openstack-cell1: + containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo + storageRequest: 500M memcached: enabled: true templates: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml b/config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml deleted file mode 100644 index 4a5602a7..00000000 --- a/config/samples/core_v1beta1_openstackcontrolplane_separate_cell_db.yaml +++ /dev/null @@ -1,129 +0,0 @@ -apiVersion: core.openstack.org/v1beta1 -kind: OpenStackControlPlane -metadata: - name: openstack-separate-cell-db -spec: - secret: osp-secret - storageClass: local-storage - keystone: - template: - containerImage: quay.io/tripleozedcentos9/openstack-keystone:current-tripleo - databaseInstance: openstack - secret: osp-secret - mariadb: - templates: - openstack: - containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo - storageRequest: 500M - openstack-cell1: - containerImage: quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo - storageRequest: 500M - rabbitmq: - templates: - rabbitmq: - replicas: 1 - #resources: - # requests: - # cpu: 500m - # memory: 1Gi - # limits: - # cpu: 800m - # memory: 1Gi - rabbitmq-cell1: - replicas: 1 - memcached: - enabled: true - templates: - memcached: - containerImage: quay.io/tripleozedcentos9/openstack-memcached:current-tripleo - replicas: 1 - placement: - template: - databaseInstance: openstack - containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo - secret: osp-secret - glance: - template: - databaseInstance: openstack - containerImage: quay.io/tripleozedcentos9/openstack-glance-api:current-tripleo - storageClass: "" - storageRequest: 10G - glanceAPIInternal: - containerImage: quay.io/tripleozedcentos9/openstack-glance-api:current-tripleo - glanceAPIExternal: - containerImage: quay.io/tripleozedcentos9/openstack-glance-api:current-tripleo - cinder: - template: - databaseInstance: openstack - secret: osp-secret - cinderAPI: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-cinder-api:current-tripleo - cinderScheduler: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-cinder-scheduler:current-tripleo - cinderBackup: - replicas: 0 # backend needs to be configured - containerImage: quay.io/tripleozedcentos9/openstack-cinder-backup:current-tripleo - cinderVolumes: - volume1: - containerImage: quay.io/tripleozedcentos9/openstack-cinder-volume:current-tripleo - replicas: 0 # backend needs to be configured - ovn: - template: - ovnDBCluster: - ovndbcluster-nb: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo - dbType: NB - storageRequest: 10G - ovndbcluster-sb: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo - dbType: SB - storageRequest: 10G - ovnNorthd: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo - ovs: - template: - ovsContainerImage: "quay.io/skaplons/ovs:latest" - ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo" - external-ids: - system-id: "random" - ovn-bridge: "br-int" - ovn-encap-type: "geneve" - neutron: - template: - databaseInstance: openstack - containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo - secret: osp-secret - nova: - template: - secret: osp-secret - cellTemplates: - cell0: - cellDatabaseUser: nova_cell0 - cellDatabaseInstance: openstack - hasAPIAccess: true - cell1: - cellDatabaseUser: nova_cell1 - cellDatabaseInstance: openstack-cell1 - cellMessageBusInstance: rabbitmq-cell1 - hasAPIAccess: true - ironic: - template: - databaseInstance: openstack - ironicAPI: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo - ironicConductors: - - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo - pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo - storageRequest: 10G - ironicInspector: - replicas: 1 - containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo - pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo - secret: osp-secret diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index b131c5e6..d1f99f3e 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -2,6 +2,5 @@ resources: - core_v1beta1_openstackcontrolplane.yaml - core_v1beta1_openstackcontrolplane_collapsed_cell.yaml -- core_v1beta1_openstackcontrolplane_separate_cell_db.yaml - core_v1beta1_openstackcontrolplane_network_isolation.yaml #+kubebuilder:scaffold:manifestskustomizesamples