From 8c86d6a42c7bce0ff27c39c46190a32557432a2e Mon Sep 17 00:00:00 2001 From: Vasyl Saienko Date: Thu, 26 Mar 2020 11:59:08 +0200 Subject: [PATCH] [Designate] Bring consistency to oslo_db endpoints Replace user with desginate as this key is explicitly used by helm-toolkit functions. Change-Id: If86a08086f5ff8486586384bf278ec668fc352d5 --- designate/templates/configmap-etc.yaml | 4 ++-- designate/templates/secret-db.yaml | 2 +- designate/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designate/templates/configmap-etc.yaml b/designate/templates/configmap-etc.yaml index 8423f59011..fc3e727af8 100644 --- a/designate/templates/configmap-etc.yaml +++ b/designate/templates/configmap-etc.yaml @@ -56,8 +56,8 @@ {{- end -}} {{- 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" "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 (index .Values.conf.designate "storage:sqlalchemy") "connection" -}} +{{- $_ := tuple "oslo_db" "internal" "designate" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.designate.database "connection" -}} {{- end -}} {{- if empty .Values.conf.designate.DEFAULT.transport_url -}} diff --git a/designate/templates/secret-db.yaml b/designate/templates/secret-db.yaml index fb6ca1db9a..7aba080184 100644 --- a/designate/templates/secret-db.yaml +++ b/designate/templates/secret-db.yaml @@ -14,7 +14,7 @@ {{- if .Values.manifests.secret_db }} {{- $envAll := . }} -{{- range $key1, $userClass := tuple "admin" "user" }} +{{- range $key1, $userClass := tuple "admin" "designate" }} {{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }} --- apiVersion: v1 diff --git a/designate/values.yaml b/designate/values.yaml index 9a700306fd..c6a7722643 100644 --- a/designate/values.yaml +++ b/designate/values.yaml @@ -736,7 +736,7 @@ endpoints: admin: username: root password: password - user: + designate: username: designate password: password hosts: