From 565fb4606b54444f4ea126a598ec0519c8aec75c Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 4 Jun 2019 11:52:06 +0200 Subject: [PATCH] htk: provide default domain env and secrets We currently do not provide any env or secrets for the default domain id for keystone This makes it so we provide both like any other vars Change-Id: I00c68026af25d8c5af37fcb3a6e1bb0e2da13e1e --- .../templates/snippets/_keystone_openrc_env_vars.tpl | 5 +++++ helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl | 1 + 2 files changed, 6 insertions(+) diff --git a/helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl b/helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl index 1d4f483a7..d856ab21f 100644 --- a/helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl +++ b/helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl @@ -113,4 +113,9 @@ return: | secretKeyRef: name: {{ $ksUserSecret }} key: OS_PASSWORD +- name: OS_DEFAULT_DOMAIN + valueFrom: + secretKeyRef: + name: {{ $ksUserSecret }} + key: OS_DEFAULT_DOMAIN {{- end }} diff --git a/helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl b/helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl index 45054ff5d..f6083b9bb 100644 --- a/helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl +++ b/helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl @@ -27,4 +27,5 @@ OS_PROJECT_NAME: {{ $userContext.project_name | b64enc }} OS_USER_DOMAIN_NAME: {{ $userContext.user_domain_name | b64enc }} OS_USERNAME: {{ $userContext.username | b64enc }} OS_PASSWORD: {{ $userContext.password | b64enc }} +OS_DEFAULT_DOMAIN: {{ $userContext.default_domain_id | default "default" | b64enc }} {{- end }}