openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Ceph: fix overriding ceph monitor hosts value"

Browse Source
This commit is contained in:
Zuul 2019-04-08 16:38:31 +00:00 committed by Gerrit Code Review
commit da8cb2ffa1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helm-toolkit/templates/manifests/_ceph-storageclass.tpl
View File

@ -87,6 +87,10 @@ examples:
{{- define "helm-toolkit.manifests.ceph-storageclass" -}} {{- define "helm-toolkit.manifests.ceph-storageclass" -}}
{{- $envAll := index . "envAll" -}} {{- $envAll := index . "envAll" -}}
{{- $monHost := $envAll.Values.conf.ceph.global.mon_host -}}
{{- if empty $monHost -}}
{{- $monHost = tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" -}}
{{- end -}}
{{- $storageclassData := index . "storageclass_data" -}} {{- $storageclassData := index . "storageclass_data" -}}
--- ---
{{- if $storageclassData.provision_storage_class }} {{- if $storageclassData.provision_storage_class }}
@ -100,7 +104,7 @@ metadata:
name: {{ $storageclassData.metadata.name }} name: {{ $storageclassData.metadata.name }}
provisioner: {{ $storageclassData.provisioner }} provisioner: {{ $storageclassData.provisioner }}
parameters: parameters:
monitors: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} monitors: {{ $monHost }}
{{- range $attr, $value := $storageclassData.parameters }} {{- range $attr, $value := $storageclassData.parameters }}
{{ $attr }}: {{ $value | quote }} {{ $attr }}: {{ $value | quote }}
{{- end }} {{- end }}