From 3552406832cb8874e74f819cbc9d86861058ab05 Mon Sep 17 00:00:00 2001
From: Renis Makadia <renis.makadia@att.com>
Date: Mon, 4 Feb 2019 11:14:59 -0800
Subject: [PATCH] Ceph-RGW code cleanup

Currently both 'deployment:rgw_keystone_user_and_endpoints`
and 'conf: rgw_ks' are used and set to true to deploy
ceph-rgw with keystone integration.

Going forward, we should only use `conf: rgw_ks: enabled: true`
to deploy ceph-rgw with keystone integration.

Change-Id: I17aecd4f977ed897bb0771edc9acafd4479777d1
---
 ceph-rgw/templates/configmap-bin-ks.yaml | 2 +-
 ceph-rgw/templates/job-ks-endpoints.yaml | 2 +-
 ceph-rgw/templates/job-ks-service.yaml   | 2 +-
 ceph-rgw/templates/job-ks-user.yaml      | 2 +-
 ceph-rgw/templates/secret-keystone.yaml  | 2 +-
 ceph-rgw/values.yaml                     | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ceph-rgw/templates/configmap-bin-ks.yaml b/ceph-rgw/templates/configmap-bin-ks.yaml
index 276c58477..008fb7990 100644
--- a/ceph-rgw/templates/configmap-bin-ks.yaml
+++ b/ceph-rgw/templates/configmap-bin-ks.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin_ks .Values.deployment.rgw_keystone_user_and_endpoints }}
+{{- if and .Values.manifests.configmap_bin_ks .Values.conf.rgw_ks.enabled }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/ceph-rgw/templates/job-ks-endpoints.yaml b/ceph-rgw/templates/job-ks-endpoints.yaml
index 4062c0771..f972fb497 100644
--- a/ceph-rgw/templates/job-ks-endpoints.yaml
+++ b/ceph-rgw/templates/job-ks-endpoints.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.job_ks_endpoints .Values.deployment.rgw_keystone_user_and_endpoints }}
+{{- if and .Values.manifests.job_ks_endpoints .Values.conf.rgw_ks.enabled }}
 {{- $ksServiceJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceTypes" ( tuple "object-store" ) -}}
 {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
 {{- end }}
diff --git a/ceph-rgw/templates/job-ks-service.yaml b/ceph-rgw/templates/job-ks-service.yaml
index 4b18dee87..9f25e860b 100644
--- a/ceph-rgw/templates/job-ks-service.yaml
+++ b/ceph-rgw/templates/job-ks-service.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.job_ks_service .Values.deployment.rgw_keystone_user_and_endpoints }}
+{{- if and .Values.manifests.job_ks_service .Values.conf.rgw_ks.enabled }}
 {{- $ksServiceJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceTypes" ( tuple "object-store" ) -}}
 {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
 {{- end }}
diff --git a/ceph-rgw/templates/job-ks-user.yaml b/ceph-rgw/templates/job-ks-user.yaml
index 7243199f2..1c5ed579e 100644
--- a/ceph-rgw/templates/job-ks-user.yaml
+++ b/ceph-rgw/templates/job-ks-user.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.job_ks_user .Values.deployment.rgw_keystone_user_and_endpoints }}
+{{- if and .Values.manifests.job_ks_user .Values.conf.rgw_ks.enabled }}
 {{- $ksUserJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceUser" "swift" -}}
 {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
 {{- end }}
diff --git a/ceph-rgw/templates/secret-keystone.yaml b/ceph-rgw/templates/secret-keystone.yaml
index bea479fa3..d9b5fe311 100644
--- a/ceph-rgw/templates/secret-keystone.yaml
+++ b/ceph-rgw/templates/secret-keystone.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.secret_keystone .Values.deployment.rgw_keystone_user_and_endpoints }}
+{{- if and .Values.manifests.secret_keystone .Values.conf.rgw_ks.enabled }}
 {{- $envAll := . }}
 {{- range $key1, $userClass := tuple "admin" "swift" }}
 {{- $secretName := index $envAll.Values.secrets.identity $userClass }}
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index c598674a6..366699282 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -19,7 +19,6 @@
 
 deployment:
   ceph: false
-  rgw_keystone_user_and_endpoints: false
 
 release_group: null