openstack/openstack-helm
Code Issues Proposed changes

Merge "[Designate] Bring consistency to oslo_db endpoints"

Browse Source
This commit is contained in:
Zuul 2020-03-29 00:17:49 +00:00 committed by Gerrit Code Review
commit 32a43ffda1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
designate/templates/configmap-etc.yaml
View File

@ -56,8 +56,8 @@
{{- end -}} {{- end -}}
{{- if empty (index .Values.conf.designate "storage:sqlalchemy").connection -}} {{- if empty (index .Values.conf.designate "storage:sqlalchemy").connection -}}
{{- $_ := tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set (index .Values.conf.designate "storage:sqlalchemy") "connection" -}} {{- $_ := tuple "oslo_db" "internal" "designate" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set (index .Values.conf.designate "storage:sqlalchemy") "connection" -}}
{{- $_ := tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.designate.database "connection" -}} {{- $_ := tuple "oslo_db" "internal" "designate" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.designate.database "connection" -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.designate.DEFAULT.transport_url -}} {{- if empty .Values.conf.designate.DEFAULT.transport_url -}}

2
designate/templates/secret-db.yaml
View File

@ -14,7 +14,7 @@
{{- if .Values.manifests.secret_db }} {{- if .Values.manifests.secret_db }}
{{- $envAll := . }} {{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }} {{- range $key1, $userClass := tuple "admin" "designate" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }} {{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
--- ---
apiVersion: v1 apiVersion: v1

2
designate/values.yaml
View File

@ -736,7 +736,7 @@ endpoints:
admin: admin:
username: root username: root
password: password password: password
user: designate:
username: designate username: designate
password: password password: password
hosts: hosts: