Merge pull request openstack-k8s-operators#54 from jistr/f/config-sample-update

Update config sample for new format (service subset deployment)

Author: openshift-merge-robot

config/samples/core_v1beta1_openstackcontrolplane.yaml

@@ -5,43 +5,49 @@ metadata:
 spec:
   secret: osp-secret
   storageClass: local-storage
-  keystoneTemplate:
-    containerImage: quay.io/tripleowallabycentos9/openstack-keystone:current-tripleo
-    databaseInstance: openstack
-  mariadbTemplate:
-    containerImage: quay.io/tripleowallabycentos9/openstack-mariadb:current-tripleo
-    storageRequest: 500M
-  rabbitmqTemplate:
-    replicas: 1
-    #resources:
-    #  requests:
-    #    cpu: 500m
-    #    memory: 1Gi
-    #  limits:
-    #    cpu: 800m
-    #    memory: 1Gi
-  placementTemplate:
-    containerImage: quay.io/tripleowallabycentos9/openstack-placement-api:current-tripleo
-  glanceTemplate:
-    databaseInstance: openstack
-    containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
-    storageClass: ""
-    storageRequest: 10G
-    glanceAPIInternal:
-      containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
-    glanceAPIExternal:
-      containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
-  cinderTemplate:
-    cinderAPI:
-      replicas: 1
-      containerImage: quay.io/tripleowallabycentos9/openstack-cinder-api:current-tripleo
-    cinderScheduler:
-      replicas: 1
-      containerImage: quay.io/tripleowallabycentos9/openstack-cinder-scheduler:current-tripleo
-    cinderBackup:
+  keystone:
+    template:
+      containerImage: quay.io/tripleowallabycentos9/openstack-keystone:current-tripleo
+      databaseInstance: openstack
+  mariadb:
+    template:
+      containerImage: quay.io/tripleowallabycentos9/openstack-mariadb:current-tripleo
+      storageRequest: 500M
+  rabbitmq:
+    template:
       replicas: 1
-      containerImage: quay.io/tripleowallabycentos9/openstack-cinder-backup:current-tripleo
-    cinderVolumes:
-      volume1:
-        containerImage: quay.io/tripleowallabycentos9/openstack-cinder-volume:current-tripleo
+      #resources:
+      #  requests:
+      #    cpu: 500m
+      #    memory: 1Gi
+      #  limits:
+      #    cpu: 800m
+      #    memory: 1Gi
+  placement:
+    template:
+      containerImage: quay.io/tripleowallabycentos9/openstack-placement-api:current-tripleo
+  glance:
+    template:
+      databaseInstance: openstack
+      containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
+      storageClass: ""
+      storageRequest: 10G
+      glanceAPIInternal:
+        containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
+      glanceAPIExternal:
+        containerImage: quay.io/tripleowallabycentos9/openstack-glance-api:current-tripleo
+  cinder:
+    template:
+      cinderAPI:
+        replicas: 1
+        containerImage: quay.io/tripleowallabycentos9/openstack-cinder-api:current-tripleo
+      cinderScheduler:
+        replicas: 1
+        containerImage: quay.io/tripleowallabycentos9/openstack-cinder-scheduler:current-tripleo
+      cinderBackup:
         replicas: 1
+        containerImage: quay.io/tripleowallabycentos9/openstack-cinder-backup:current-tripleo
+      cinderVolumes:
+        volume1:
+          containerImage: quay.io/tripleowallabycentos9/openstack-cinder-volume:current-tripleo
+          replicas: 1