[cronus] fixing hermes resolve

sapcc · Jun 20, 2024 · f5df82b · f5df82b
1 parent 6161590
commit f5df82b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openstack/cronus/templates/cronus/secrets.yaml b/openstack/cronus/templates/cronus/secrets.yaml
@@ -13,8 +13,8 @@ data:
   SENTRY_DSN: {{ .Values.cronus.sentryDsn | b64enc }}
   RABBITMQ_URI: {{ printf "amqp://%s:%s@%s/" .Values.rabbitmq.users.default.user .Values.rabbitmq.users.default.password .Values.rabbitmq.host | b64enc }}
   {{- $host := printf "%s.%s.%s:5672" "hermes-rabbitmq-notifications" $.Values.global.region $.Values.global.tld }}
-  {{- $user := "{{ resolve \".Values.rabbitmq_notifications.users.default.user\" }}" -}}
-  {{- $password := "{{ resolve \".Values.rabbitmq_notifications.users.default.password\" }}" -}}
+  {{- $user := printf "{{ resolve \"%s\" }}" .Values.rabbitmq_notifications.users.default.user -}}
+  {{- $password := printf "{{ resolve \"%s\" }}" .Values.rabbitmq_notifications.users.default.password -}}
   {{- $url := printf "amqp://%s:%s@%s/" $user $password $host }}
   RABBITMQ_URL: {{ $url | b64enc }}
   {{- if .Values.config.keystone }}

diff --git a/openstack/cronus/templates/nebula/secrets.yaml b/openstack/cronus/templates/nebula/secrets.yaml
@@ -13,8 +13,8 @@ type: Opaque
 data:
   SENTRY_DSN: {{ .Values.nebula.sentryDsn | b64enc }}
   {{- $host := printf "%s.%s.%s:5672" "hermes-rabbitmq-notifications" $.Values.global.region $.Values.global.tld }}
-  {{- $user := "{{ resolve \".Values.rabbitmq_notifications.users.default.user\" }}" -}}
-  {{- $password := "{{ resolve \".Values.rabbitmq_notifications.users.default.password\" }}" -}}
+  {{- $user := printf "{{ resolve \"%s\" }}" .Values.rabbitmq_notifications.users.default.user -}}
+  {{- $password := printf "{{ resolve \"%s\" }}" .Values.rabbitmq_notifications.users.default.password -}}
   {{- $url := printf "amqp://%s:%s@%s/" $user $password $host }}
   RABBITMQ_URL: {{ $url | b64enc }}
   SMTP_USERNAME: {{ .Values.notifier.smtpUsername | b64enc}}