From e4e01362f727291ce08afea0d52a758ebf102cb0 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Wed, 13 Sep 2017 21:29:41 +0000
Subject: [PATCH] ceph: skip rgw keyring-generator when not needed

Change-Id: I12d151587963b30a910146edaead54e55505077e
---
 ceph/templates/job-keyring.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ceph/templates/job-keyring.yaml b/ceph/templates/job-keyring.yaml
index 1038cb782a..b90cccad63 100644
--- a/ceph/templates/job-keyring.yaml
+++ b/ceph/templates/job-keyring.yaml
@@ -18,6 +18,7 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.deployment.storage_secrets }}
 {{- range $key1, $cephBootstrapKey := tuple "mds" "osd" "rgw" "mon" }}
+{{- if not (and (not $envAll.Values.manifests.deployment_rgw) (eq $cephBootstrapKey "rgw")) }}
 {{- $jobName := print $cephBootstrapKey "-keyring-generator" }}
 ---
 apiVersion: batch/v1
@@ -86,3 +87,4 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}