From 092d7103ab87699411713e45faec4640825b6cfe Mon Sep 17 00:00:00 2001
From: Renis Makadia <renis.makadia@att.com>
Date: Thu, 7 Feb 2019 11:15:26 -0800
Subject: [PATCH] Ceph-RGW - Update chart install scripts

- As part of PS 634782, Ceph-rgw chart was updated. We need to update
Ceph chart install script as per new changes.

Change-Id: Ieede912272903ed251693879f17a821cb2a4e7bb
---
 doc/source/specs/tenant-ceph.rst                         | 4 ----
 tools/deployment/armada/manifests/armada-osh.yaml        | 1 -
 tools/deployment/component/ceph/ceph-ns-activate.sh      | 9 ---------
 tools/deployment/component/ceph/ceph.sh                  | 9 ---------
 tools/deployment/developer/ceph/110-ceph-radosgateway.sh | 1 -
 tools/deployment/multinode/090-ceph-radosgateway.sh      | 1 -
 6 files changed, 25 deletions(-)

diff --git a/doc/source/specs/tenant-ceph.rst b/doc/source/specs/tenant-ceph.rst
index ec1bf03fa1..9e95740212 100644
--- a/doc/source/specs/tenant-ceph.rst
+++ b/doc/source/specs/tenant-ceph.rst
@@ -132,7 +132,6 @@ Update script with following overrides.
     rbd_provisioner: true
     cephfs_provisioner: false
     client_secrets: false
-    rgw_keystone_user_and_endpoints: false
   endpoints:
     ceph_mon:
       namespace: ceph
@@ -532,7 +531,6 @@ Update script's override section with following:
     rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: false
-    rgw_keystone_user_and_endpoints: false
   labels:
     mon:
       node_selector_key: ceph-mon-tenant
@@ -639,7 +637,6 @@ Update script as following:
     rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: true
-    rgw_keystone_user_and_endpoints: false
   bootstrap:
     enabled: false
   conf:
@@ -703,7 +700,6 @@ Update script with following overrides:
     rbd_provisioner: false
     cephfs_provisioner: false
     client_secrets: false
-    rgw_keystone_user_and_endpoints: true
   bootstrap:
     enabled: false
   conf:
diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index 302815f9ca..e6509676c6 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -411,7 +411,6 @@ data:
       rbd_provisioner: False
       cephfs_provisioner: False
       client_secrets: False
-      rgw_keystone_user_and_endpoints: True
   source:
     type: local
     location: ${OSH_INFRA_PATH}
diff --git a/tools/deployment/component/ceph/ceph-ns-activate.sh b/tools/deployment/component/ceph/ceph-ns-activate.sh
index 110397837b..fcef44f423 100755
--- a/tools/deployment/component/ceph/ceph-ns-activate.sh
+++ b/tools/deployment/component/ceph/ceph-ns-activate.sh
@@ -26,27 +26,18 @@ make -C ${HELM_CHART_ROOT_PATH} ceph-provisioners
 #NOTE: Deploy command
 tee /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
 EOF
 helm upgrade --install ceph-openstack-config ${HELM_CHART_ROOT_PATH}/ceph-provisioners \
   --namespace=openstack \
diff --git a/tools/deployment/component/ceph/ceph.sh b/tools/deployment/component/ceph/ceph.sh
index 2194af2b0c..49795be503 100755
--- a/tools/deployment/component/ceph/ceph.sh
+++ b/tools/deployment/component/ceph/ceph.sh
@@ -36,14 +36,6 @@ else
 fi
 tee /tmp/ceph.yaml <<EOF
 endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
-    port:
-      api:
-        default: 8088
-        public: 80
   ceph_mon:
     namespace: ceph
     port:
@@ -65,7 +57,6 @@ deployment:
   rbd_provisioner: true
   cephfs_provisioner: true
   client_secrets: false
-  rgw_keystone_user_and_endpoints: false
 bootstrap:
   enabled: true
 conf:
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index 33bb55bae4..87d8ec1f5b 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -35,7 +35,6 @@ network:
   cluster: 172.17.0.1/16
 deployment:
   ceph: true
-  rgw_keystone_user_and_endpoints: true
 bootstrap:
   enabled: false
 conf:
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index 8e7658198b..e30bdea765 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -32,7 +32,6 @@ network:
   cluster: ${CEPH_CLUSTER_NETWORK}
 deployment:
   ceph: true
-  rgw_keystone_user_and_endpoints: true
 bootstrap:
   enabled: false
 conf: