Ceph: Chart template tidy

This PS tidies many of the templates in the Ceph chart.

Change-Id: Ib4c609349edc8d017c0ca30580afedeb9ccbecdb

tools/deployment/developer/ceph/040-ceph.sh

@@ -20,22 +20,40 @@ set -xe
 make pull-images ceph
 
 #NOTE: Deploy command
-WORK_DIR=$(pwd)
-helm install --namespace=ceph ${WORK_DIR}/ceph --name=ceph \
-    --set endpoints.identity.namespace=openstack \
-    --set endpoints.object_store.namespace=ceph \
-    --set endpoints.ceph_mon.namespace=ceph \
-    --set ceph.rgw_keystone_auth=true \
-    --set network.public=172.17.0.1/16 \
-    --set network.cluster=172.17.0.1/16 \
-    --set deployment.storage_secrets=true \
-    --set deployment.ceph=true \
-    --set deployment.rbd_provisioner=true \
-    --set deployment.cephfs_provisioner=true \
-    --set deployment.client_secrets=false \
-    --set deployment.rgw_keystone_user_and_endpoints=false \
-    --set bootstrap.enabled=true \
-    --values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
+cat > /tmp/ceph.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: 172.17.0.1/16
+  cluster: 172.17.0.1/16
+deployment:
+  storage_secrets: true
+  ceph: true
+  rbd_provisioner: true
+  cephfs_provisioner: true
+  client_secrets: false
+  rgw_keystone_user_and_endpoints: false
+bootstrap:
+  enabled: true
+conf:
+  rgw_ks:
+    enabled: true
+  ceph:
+    config:
+      global:
+        osd_pool_default_size: 1
+      osd:
+        osd_crush_chooseleaf_type: 0
+EOF
+helm install ./ceph \
+  --namespace=ceph \
+  --name=ceph \
+  --values=/tmp/ceph.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph

tools/deployment/developer/ceph/045-ceph-ns-activate.sh

@@ -20,21 +20,40 @@ set -xe
 make pull-images ceph
 
 #NOTE: Deploy command
-WORK_DIR=$(pwd)
-helm install --namespace=openstack ${WORK_DIR}/ceph --name=ceph-openstack-config \
-    --set endpoints.identity.namespace=openstack \
-    --set endpoints.object_store.namespace=ceph \
-    --set endpoints.ceph_mon.namespace=ceph \
-    --set ceph.rgw_keystone_auth=true \
-    --set network.public=172.17.0.1/16 \
-    --set network.cluster=172.17.0.1/16 \
-    --set deployment.storage_secrets=false \
-    --set deployment.ceph=false \
-    --set deployment.rbd_provisioner=false \
-    --set deployment.cephfs_provisioner=false \
-    --set deployment.client_secrets=true \
-    --set deployment.rgw_keystone_user_and_endpoints=false \
-    --values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
+cat > /tmp/ceph-openstack-config.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: 172.17.0.1/16
+  cluster: 172.17.0.1/16
+deployment:
+  storage_secrets: false
+  ceph: false
+  rbd_provisioner: false
+  cephfs_provisioner: false
+  client_secrets: true
+  rgw_keystone_user_and_endpoints: false
+bootstrap:
+  enabled: false
+conf:
+  rgw_ks:
+    enabled: true
+  ceph:
+    config:
+      global:
+        osd_pool_default_size: 1
+      osd:
+        osd_crush_chooseleaf_type: 0
+EOF
+helm install ./ceph \
+  --namespace=openstack \
+  --name=ceph-openstack-config \
+  --values=/tmp/ceph-openstack-config.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/ceph/110-ceph-radosgateway.sh

@@ -20,21 +20,40 @@ set -xe
 make pull-images ceph
 
 #NOTE: Deploy command
-WORK_DIR=$(pwd)
-helm install --namespace=openstack ${WORK_DIR}/ceph --name=radosgw-openstack \
-   --set endpoints.identity.namespace=openstack \
-   --set endpoints.object_store.namespace=ceph \
-   --set endpoints.ceph_mon.namespace=ceph \
-   --set ceph.rgw_keystone_auth=true \
-   --set network.public=172.17.0.1/16 \
-   --set network.cluster=172.17.0.1/16 \
-   --set deployment.storage_secrets=false \
-   --set deployment.ceph=false \
-   --set deployment.rbd_provisioner=false \
-   --set deployment.cephfs_provisioner=false \
-   --set deployment.client_secrets=false \
-   --set deployment.rgw_keystone_user_and_endpoints=true \
-   --values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
+cat > /tmp/radosgw-openstack.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: 172.17.0.1/16
+  cluster: 172.17.0.1/16
+deployment:
+  storage_secrets: false
+  ceph: false
+  rbd_provisioner: false
+  cephfs_provisioner: false
+  client_secrets: false
+  rgw_keystone_user_and_endpoints: true
+bootstrap:
+  enabled: false
+conf:
+  rgw_ks:
+    enabled: true
+  ceph:
+    config:
+      global:
+        osd_pool_default_size: 1
+      osd:
+        osd_crush_chooseleaf_type: 0
+EOF
+helm install ./ceph \
+  --namespace=openstack \
+  --name=radosgw-openstack \
+  --values=/tmp/radosgw-openstack.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/multinode/030-ceph.sh

@@ -17,21 +17,36 @@
 set -xe
 
 #NOTE: Deploy command
+CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+cat > /tmp/ceph.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: ${CEPH_PUBLIC_NETWORK}
+  cluster: ${CEPH_CLUSTER_NETWORK}
+deployment:
+  storage_secrets: true
+  ceph: true
+  rbd_provisioner: true
+  cephfs_provisioner: true
+  client_secrets: false
+  rgw_keystone_user_and_endpoints: false
+bootstrap:
+  enabled: true
+conf:
+  rgw_ks:
+    enabled: true
+EOF
 helm install ./ceph \
-    --namespace=ceph \
-    --name=ceph \
-    --set endpoints.identity.namespace=openstack \
-    --set endpoints.object_store.namespace=ceph \
-    --set endpoints.ceph_mon.namespace=ceph \
-    --set ceph.rgw_keystone_auth=true \
-    --set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-    --set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-    --set deployment.storage_secrets=true \
-    --set deployment.ceph=true \
-    --set deployment.rbd_provisioner=true \
-    --set deployment.client_secrets=false \
-    --set deployment.rgw_keystone_user_and_endpoints=false \
-    --set bootstrap.enabled=true
+  --namespace=ceph \
+  --name=ceph \
+  --values=/tmp/ceph.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph 1200

tools/deployment/multinode/040-ceph-ns-activate.sh

@@ -17,21 +17,36 @@
 set -xe
 
 #NOTE: Deploy command
+CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+cat > /tmp/ceph-openstack-config.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: ${CEPH_PUBLIC_NETWORK}
+  cluster: ${CEPH_CLUSTER_NETWORK}
+deployment:
+  storage_secrets: false
+  ceph: false
+  rbd_provisioner: false
+  cephfs_provisioner: false
+  client_secrets: true
+  rgw_keystone_user_and_endpoints: false
+bootstrap:
+  enabled: false
+conf:
+  rgw_ks:
+    enabled: true
+EOF
 helm install ./ceph \
   --namespace=openstack \
   --name=ceph-openstack-config \
-  --set endpoints.identity.namespace=openstack \
-  --set endpoints.object_store.namespace=ceph \
-  --set endpoints.ceph_mon.namespace=ceph \
-  --set ceph.rgw_keystone_auth=true \
-  --set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-  --set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-  --set deployment.storage_secrets=false \
-  --set deployment.ceph=false \
-  --set deployment.rbd_provisioner=false \
-  --set deployment.cephfs_provisioner=false \
-  --set deployment.client_secrets=true \
-  --set deployment.rgw_keystone_user_and_endpoints=false
+  --values=/tmp/ceph-openstack-config.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/multinode/090-ceph-radosgateway.sh

@@ -16,21 +16,37 @@
 
 set -xe
 
+#NOTE: Deploy command
+CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
+cat > /tmp/radosgw-openstack.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: ceph
+  ceph_mon:
+    namespace: ceph
+network:
+  public: ${CEPH_PUBLIC_NETWORK}
+  cluster: ${CEPH_CLUSTER_NETWORK}
+deployment:
+  storage_secrets: false
+  ceph: false
+  rbd_provisioner: false
+  cephfs_provisioner: false
+  client_secrets: false
+  rgw_keystone_user_and_endpoints: true
+bootstrap:
+  enabled: false
+conf:
+  rgw_ks:
+    enabled: true
+EOF
 helm install ./ceph \
-    --namespace=openstack \
-    --name=radosgw-openstack \
-    --set endpoints.identity.namespace=openstack \
-    --set endpoints.object_store.namespace=ceph \
-    --set endpoints.ceph_mon.namespace=ceph \
-    --set ceph.rgw_keystone_auth=true \
-    --set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-    --set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
-    --set deployment.storage_secrets=false \
-    --set deployment.ceph=false \
-    --set deployment.rbd_provisioner=false \
-    --set deployment.cephfs_provisioner=false \
-    --set deployment.client_secrets=false \
-    --set deployment.rgw_keystone_user_and_endpoints=true
+  --namespace=openstack \
+  --name=radosgw-openstack \
+  --values=/tmp/radosgw-openstack.yaml
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/overrides/mvp/ceph.yaml

@@ -1,21 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-conf:
-  ceph:
-    config:
-      global:
-        osd_pool_default_size: 1
-      osd:
-        osd_crush_chooseleaf_type: 0