Merge "Ceph-Client: update configmap name for defragosds cronjob"

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 }}

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