From beadf984d4cf2e76167b54f5ed44719a6347cf99 Mon Sep 17 00:00:00 2001
From: Jaesang Lee <jaesang_lee@sk.com>
Date: Tue, 9 Jan 2018 10:38:32 +0900
Subject: [PATCH] Ceph: add manifests optional for job-rbd-pool

Every manifests has to be controlled by manifests key in values.yaml.
In ceph, job-rbd-pool doesn't have manifests value,
so it can't be disabled.

When using already installed ceph, it is necessary to disable
job-rbd-pool because it is an unnecessary.

Change-Id: Idf61855423f28fbb1c7730118869bdddc463960b
Closes-bug: 1742017
---
 ceph/templates/job-rbd-pool.yaml | 2 ++
 ceph/values.yaml                 | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ceph/templates/job-rbd-pool.yaml b/ceph/templates/job-rbd-pool.yaml
index ed1610cfa5..b48911533a 100644
--- a/ceph/templates/job-rbd-pool.yaml
+++ b/ceph/templates/job-rbd-pool.yaml
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- if .Values.manifests.job_rbd_pool }}
 {{- if .Values.deployment.ceph }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.rbd_pool }}
@@ -95,3 +96,4 @@ spec:
           secret:
             secretName: {{ .Values.secrets.keyrings.admin }}
 {{- end }}
+{{- end }}
diff --git a/ceph/values.yaml b/ceph/values.yaml
index ad7332bdba..0c68b33117 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -451,6 +451,7 @@ manifests:
   job_ks_user: true
   job_namespace_client_key_cleaner: true
   job_namespace_client_key: true
+  job_rbd_pool: true
   job_storage_admin_keys: true
   secret_keystone_rgw: true
   secret_keystone: true