From acd5d11bc22a38eac88fb2b9ea647053d9e78180 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Thu, 1 Aug 2019 10:09:03 -0500
Subject: [PATCH] Ceph-Client: update configmap name for defragosds cronjob

This is to update configmap names using by defragosds cronjob.

Change-Id: I29608cd8b6ce1e30615a0f92853939d7bbae9972
---
 ceph-client/templates/cronjob-defragosds.yaml  | 10 +++-------
 tools/deployment/osh-infra-logging/020-ceph.sh |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ceph-client/templates/cronjob-defragosds.yaml b/ceph-client/templates/cronjob-defragosds.yaml
index e204eed96..cb2a03482 100644
--- a/ceph-client/templates/cronjob-defragosds.yaml
+++ b/ceph-client/templates/cronjob-defragosds.yaml
@@ -92,7 +92,7 @@ spec:
                 mountPath: /tmp
               - name: pod-etc-ceph
                 mountPath: /etc/ceph
-              - name: ceph-osd-bin
+              - name: ceph-client-bin
                 mountPath: /tmp/utils-defragOSDs.sh
                 subPath: utils-defragOSDs.sh
                 readOnly: true
@@ -103,12 +103,8 @@ spec:
               emptyDir: {}
             - name: pod-etc-ceph
               emptyDir: {}
-            - name: ceph-osd-bin
+            - name: ceph-client-bin
               configMap:
-                name:  {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
+                name:  ceph-client-bin
                 defaultMode: 0555
-            - name: ceph-client-etc
-              configMap:
-                name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
-                defaultMode: 0444
 {{- end }}
diff --git a/tools/deployment/osh-infra-logging/020-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh
index 5ef73e30d..c642c3dcb 100755
--- a/tools/deployment/osh-infra-logging/020-ceph.sh
+++ b/tools/deployment/osh-infra-logging/020-ceph.sh
@@ -185,7 +185,6 @@ jobs:
       execPolicy: Forbid
     startingDeadlineSecs: 60
 manifests:
-  cronjob_defragosds: true
   job_bootstrap: false
 EOF