openstack/openstack-helm
Code Issues Proposed changes

Gnocchi: Keystone secret for k8s 1.8

Browse Source 
This PS updates the keystone secret in Gnocci to be compatible with
Kubernetes 1.8 which has stricter requirements for secret
definitions.

Change-Id: Ie5799bdb531fab02ba0c817bdd9d692f3cedd0a9
This commit is contained in:
Pete Birley 2017-11-13 19:46:55 -06:00
parent 2c89386765
commit f03e618d27
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnocchi/templates/bin/_storage-init.sh.tpl
View File

@ -50,7 +50,6 @@ metadata:
name: "${RBD_POOL_SECRET}" name: "${RBD_POOL_SECRET}"
type: kubernetes.io/rbd type: kubernetes.io/rbd
data: data:
key: | key: $( echo ${ENCODED_KEYRING} )
$( echo ${ENCODED_KEYRING} )
EOF EOF
kubectl create --namespace ${NAMESPACE} -f ${SECRET} kubectl create --namespace ${NAMESPACE} -f ${SECRET}

6
gnocchi/templates/secret-keystone.yaml
View File

@ -29,9 +29,7 @@ metadata:
type: Opaque type: Opaque
data: data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 }} {{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 }}
OS_AUTH_TYPE: | OS_AUTH_TYPE: {{ $osAuthType | b64enc }}
{{ $osAuthType | b64enc | indent 4 }} OS_TENANT_NAME: {{ $osTenantName | b64enc }}
OS_TENANT_NAME: |
{{ $osTenantName | b64enc | indent 4 }}
{{ end }} {{ end }}
{{- end }} {{- end }}