Merge "ceph: skip rgw keyring-generator when not needed"

This commit is contained in:
Jenkins 2017-09-21 00:16:28 +00:00 committed by Gerrit Code Review
commit 8e5fa85fe5

View File

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