From 75ecf8fdf43962d3069bcbdc18ae23549337232d Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 15 Jun 2018 19:26:57 -0500 Subject: [PATCH] Gotpl: remove quote and trunc to suppress output This PS removes the use of the `quote and truncate` approach to suppress output from gotpl actions in templates and replaces it with the recommended practice of defining `$_` instead. Change-Id: I5f35c5f7e70b4f7f461d772e3b72ed1c695c56a8 Signed-off-by: Pete Birley --- barbican/templates/configmap-etc.yaml | 30 ++--- ceilometer/templates/configmap-etc.yaml | 50 ++++----- .../templates/configmap-etc-client.yaml | 6 +- ceph-mon/templates/configmap-etc.yaml | 8 +- ceph-osd/templates/configmap-etc.yaml | 8 +- cinder/templates/configmap-etc.yaml | 44 ++++---- congress/templates/configmap-etc.yaml | 26 ++--- doc/source/devref/oslo-config.rst | 6 +- glance/templates/configmap-etc.yaml | 70 ++++++------ gnocchi/templates/configmap-etc.yaml | 36 +++--- heat/templates/configmap-etc.yaml | 58 +++++----- ingress/templates/configmap-conf.yaml | 2 +- ingress/templates/deployment-ingress.yaml | 4 +- ingress/templates/ingress.yaml | 2 +- ironic/templates/configmap-etc.yaml | 100 ++++++++--------- keystone/templates/configmap-etc.yaml | 6 +- magnum/templates/configmap-etc.yaml | 32 +++--- mistral/templates/configmap-etc.yaml | 26 ++--- neutron/templates/configmap-etc.yaml | 56 ++++----- nova/templates/configmap-etc.yaml | 106 +++++++++--------- rabbitmq/templates/configmap-etc.yaml | 8 +- rally/templates/configmap-etc.yaml | 22 ++-- senlin/templates/configmap-etc.yaml | 38 +++---- tempest/templates/configmap-etc.yaml | 14 +-- 24 files changed, 379 insertions(+), 379 deletions(-) diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml index 860ee8ea07..f592981795 100644 --- a/barbican/templates/configmap-etc.yaml +++ b/barbican/templates/configmap-etc.yaml @@ -18,58 +18,58 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.barbican.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.barbican.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.region_name -}} -{{- set .Values.conf.barbican.keystone_authtoken "region_name" .Values.endpoints.identity.auth.barbican.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "region_name" .Values.endpoints.identity.auth.barbican.region_name -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.project_name -}} -{{- set .Values.conf.barbican.keystone_authtoken "project_name" .Values.endpoints.identity.auth.barbican.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "project_name" .Values.endpoints.identity.auth.barbican.project_name -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.barbican.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.barbican.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.barbican.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.barbican.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.barbican.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.barbican.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.username -}} -{{- set .Values.conf.barbican.keystone_authtoken "username" .Values.endpoints.identity.auth.barbican.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "username" .Values.endpoints.identity.auth.barbican.username -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.password -}} -{{- set .Values.conf.barbican.keystone_authtoken "password" .Values.endpoints.identity.auth.barbican.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "password" .Values.endpoints.identity.auth.barbican.password -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.barbican.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.barbican.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.barbican.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.barbican.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.barbican.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.barbican.DEFAULT.sql_connection -}} -{{- tuple "oslo_db" "internal" "barbican" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.barbican.DEFAULT "sql_connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "barbican" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.barbican.DEFAULT "sql_connection" -}} {{- end -}} {{- if empty .Values.conf.barbican.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "barbican" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.barbican.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "barbican" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.barbican.DEFAULT "transport_url" -}} {{- end -}} {{- $barbicanPath := index .Values "endpoints" "key_manager" "path" "default" }} {{- if empty .Values.conf.barbican.DEFAULT.host_href -}} -{{- tuple "key_manager" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix $barbicanPath | set .Values.conf.barbican.DEFAULT "host_href" | quote | trunc 0 -}} +{{- $_ := tuple "key_manager" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix $barbicanPath | set .Values.conf.barbican.DEFAULT "host_href" -}} {{- end -}} {{- if empty .Values.conf.barbican.barbican_api.bind_port -}} -{{- tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.barbican.barbican_api "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.barbican.barbican_api "bind_port" -}} {{- end -}} {{- if empty .Values.conf.barbican_api.uwsgi.socket -}} -{{- printf ":%s" ( tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" ) | set .Values.conf.barbican_api.uwsgi "socket" | quote | trunc 0 -}} +{{- $_ := printf ":%s" ( tuple "key_manager" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" ) | set .Values.conf.barbican_api.uwsgi "socket" -}} {{- end -}} --- diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml index da0d74fe27..a0773d2fd2 100644 --- a/ceilometer/templates/configmap-etc.yaml +++ b/ceilometer/templates/configmap-etc.yaml @@ -18,91 +18,91 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.ceilometer.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.ceilometer.database.connection -}} -{{- tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.database.event_connection -}} -{{- tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "event_connection" | quote | trunc 0 -}} +{{- $_ := tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "event_connection" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.database.metering_connection -}} -{{- tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "metering_connection" | quote | trunc 0 -}} +{{- $_ := tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "metering_connection" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.oslo_messaging_notifications.transport_url -}} -{{- tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.oslo_messaging_notifications "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.oslo_messaging_notifications "transport_url" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.notification.messaging_urls -}} -{{- tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.notification "messaging_urls" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ceilometer.notification "messaging_urls" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.region_name -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "region_name" .Values.endpoints.identity.auth.ceilometer.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "region_name" .Values.endpoints.identity.auth.ceilometer.region_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.project_name -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ceilometer.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ceilometer.project_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.ceilometer.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.ceilometer.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.ceilometer.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.ceilometer.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.username -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "username" .Values.endpoints.identity.auth.ceilometer.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "username" .Values.endpoints.identity.auth.ceilometer.username -}} {{- end -}} {{- if empty .Values.conf.ceilometer.keystone_authtoken.password -}} -{{- set .Values.conf.ceilometer.keystone_authtoken "password" .Values.endpoints.identity.auth.ceilometer.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "password" .Values.endpoints.identity.auth.ceilometer.password -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.service_credentials "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.service_credentials "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.region_name -}} -{{- set .Values.conf.ceilometer.service_credentials "region_name" .Values.endpoints.identity.auth.ceilometer.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "region_name" .Values.endpoints.identity.auth.ceilometer.region_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.project_name -}} -{{- set .Values.conf.ceilometer.service_credentials "project_name" .Values.endpoints.identity.auth.ceilometer.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "project_name" .Values.endpoints.identity.auth.ceilometer.project_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.project_domain_name -}} -{{- set .Values.conf.ceilometer.service_credentials "project_domain_name" .Values.endpoints.identity.auth.ceilometer.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "project_domain_name" .Values.endpoints.identity.auth.ceilometer.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.user_domain_name -}} -{{- set .Values.conf.ceilometer.service_credentials "user_domain_name" .Values.endpoints.identity.auth.ceilometer.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "user_domain_name" .Values.endpoints.identity.auth.ceilometer.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.username -}} -{{- set .Values.conf.ceilometer.service_credentials "username" .Values.endpoints.identity.auth.ceilometer.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "username" .Values.endpoints.identity.auth.ceilometer.username -}} {{- end -}} {{- if empty .Values.conf.ceilometer.service_credentials.password -}} -{{- set .Values.conf.ceilometer.service_credentials "password" .Values.endpoints.identity.auth.ceilometer.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ceilometer.service_credentials "password" .Values.endpoints.identity.auth.ceilometer.password -}} {{- end -}} {{- if empty .Values.conf.ceilometer.dispatcher_gnocchi.url -}} -{{- tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.dispatcher_gnocchi "url" | quote | trunc 0 -}} +{{- $_ := tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.dispatcher_gnocchi "url" -}} {{- end -}} {{- if empty .Values.conf.ceilometer.api.aodh_url -}} -{{- tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.api "aodh_url" | quote | trunc 0 -}} +{{- $_ := tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.api "aodh_url" -}} {{- end -}} --- diff --git a/ceph-client/templates/configmap-etc-client.yaml b/ceph-client/templates/configmap-etc-client.yaml index a927912e7d..3592990580 100644 --- a/ceph-client/templates/configmap-etc-client.yaml +++ b/ceph-client/templates/configmap-etc-client.yaml @@ -23,15 +23,15 @@ limitations under the License. {{- if empty .Values.conf.ceph.global.mon_host -}} {{- $monHost := tuple "ceph_mon" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} -{{- $monHost | set .Values.conf.ceph.global "mon_host" | quote | trunc 0 -}} +{{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.cluster_network -}} -{{- .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.public_network -}} -{{- .Values.network.public | set .Values.conf.ceph.osd "public_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.public | set .Values.conf.ceph.osd "public_network" -}} {{- end -}} --- diff --git a/ceph-mon/templates/configmap-etc.yaml b/ceph-mon/templates/configmap-etc.yaml index f6030ac6a3..04b559caeb 100644 --- a/ceph-mon/templates/configmap-etc.yaml +++ b/ceph-mon/templates/configmap-etc.yaml @@ -23,19 +23,19 @@ limitations under the License. {{- if empty .Values.conf.ceph.global.mon_host -}} {{- $monHost := tuple "ceph_mon" "discovery" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} -{{- $monHost | set .Values.conf.ceph.global "mon_host" | quote | trunc 0 -}} +{{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}} {{- end -}} {{- if empty .Values.conf.ceph.global.fsid -}} -{{- uuidv4 | set .Values.conf.ceph.global "fsid" | quote | trunc 0 -}} +{{- $_ := uuidv4 | set .Values.conf.ceph.global "fsid" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.cluster_network -}} -{{- .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.public_network -}} -{{- .Values.network.public | set .Values.conf.ceph.osd "public_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.public | set .Values.conf.ceph.osd "public_network" -}} {{- end -}} --- diff --git a/ceph-osd/templates/configmap-etc.yaml b/ceph-osd/templates/configmap-etc.yaml index 60f043988a..61d0705e53 100644 --- a/ceph-osd/templates/configmap-etc.yaml +++ b/ceph-osd/templates/configmap-etc.yaml @@ -21,19 +21,19 @@ limitations under the License. {{- if empty .Values.conf.ceph.global.mon_host -}} {{- $monHost := tuple "ceph_mon" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} -{{- $monHost | set .Values.conf.ceph.global "mon_host" | quote | trunc 0 -}} +{{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}} {{- end -}} {{- if empty .Values.conf.ceph.global.fsid -}} -{{- uuidv4 | set .Values.conf.ceph.global "fsid" | quote | trunc 0 -}} +{{- $_ := uuidv4 | set .Values.conf.ceph.global "fsid" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.cluster_network -}} -{{- .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" -}} {{- end -}} {{- if empty .Values.conf.ceph.osd.public_network -}} -{{- .Values.network.public | set .Values.conf.ceph.osd "public_network" | quote | trunc 0 -}} +{{- $_ := .Values.network.public | set .Values.conf.ceph.osd "public_network" -}} {{- end -}} --- diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index b3f8a3e2b3..d00dcd4558 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -18,80 +18,80 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.cinder.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.region_name -}} -{{- set .Values.conf.cinder.keystone_authtoken "region_name" .Values.endpoints.identity.auth.cinder.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "region_name" .Values.endpoints.identity.auth.cinder.region_name -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.project_name -}} -{{- set .Values.conf.cinder.keystone_authtoken "project_name" .Values.endpoints.identity.auth.cinder.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "project_name" .Values.endpoints.identity.auth.cinder.project_name -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.cinder.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.cinder.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.cinder.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.cinder.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.cinder.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.cinder.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.username -}} -{{- set .Values.conf.cinder.keystone_authtoken "username" .Values.endpoints.identity.auth.cinder.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "username" .Values.endpoints.identity.auth.cinder.username -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.password -}} -{{- set .Values.conf.cinder.keystone_authtoken "password" .Values.endpoints.identity.auth.cinder.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "password" .Values.endpoints.identity.auth.cinder.password -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.cinder.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.cinder.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.cinder.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.cinder.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.cinder.database.connection -}} -{{- tuple "oslo_db" "internal" "cinder" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.cinder.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "cinder" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.cinder.database "connection" -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "cinder" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.cinder.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "cinder" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.cinder.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.glance_api_servers -}} -{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "glance_api_servers" | quote | trunc 0 -}} +{{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "glance_api_servers" -}} {{- end -}} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.swift" }} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_auth_version -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_auth_version" "3" | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_auth_version" "3" -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "backup_swift_auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "backup_swift_auth_url" -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_user_domain -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_user_domain" .Values.endpoints.identity.auth.cinder.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_user_domain" .Values.endpoints.identity.auth.cinder.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_user -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_user" .Values.endpoints.identity.auth.cinder.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_user" .Values.endpoints.identity.auth.cinder.username -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_key -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_key" .Values.endpoints.identity.auth.cinder.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_key" .Values.endpoints.identity.auth.cinder.password -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_project_domain -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_project_domain" .Values.endpoints.identity.auth.cinder.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_project_domain" .Values.endpoints.identity.auth.cinder.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.backup_swift_project -}} -{{- set .Values.conf.cinder.DEFAULT "backup_swift_project" .Values.endpoints.identity.auth.cinder.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "backup_swift_project" .Values.endpoints.identity.auth.cinder.project_name -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.swift_catalog_info -}} -{{- set .Values.conf.cinder.DEFAULT "swift_catalog_info" "object-store:swift:internalURL" | quote | trunc 0 -}} +{{- $_ := set .Values.conf.cinder.DEFAULT "swift_catalog_info" "object-store:swift:internalURL" -}} {{- end -}} {{- end -}} {{- if empty .Values.conf.cinder.DEFAULT.osapi_volume_listen_port -}} -{{- tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.cinder.DEFAULT "osapi_volume_listen_port" | quote | trunc 0 -}} +{{- $_ := tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.cinder.DEFAULT "osapi_volume_listen_port" -}} {{- end -}} --- apiVersion: v1 diff --git a/congress/templates/configmap-etc.yaml b/congress/templates/configmap-etc.yaml index af954667f8..13aea64571 100644 --- a/congress/templates/configmap-etc.yaml +++ b/congress/templates/configmap-etc.yaml @@ -18,49 +18,49 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.congress.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "congress" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.congress.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "congress" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.congress.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.congress.database.connection -}} -{{- tuple "oslo_db" "internal" "congress" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.congress.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "congress" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.congress.database "connection" -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.congress.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.congress.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.congress.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.auth_url -}} -{{- tuple "identity" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.congress.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.congress.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.auth_uri -}} -{{- set .Values.conf.congress.keystone_authtoken "auth_uri" .Values.conf.congress.keystone_authtoken.auth_url | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "auth_uri" .Values.conf.congress.keystone_authtoken.auth_url -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.region_name -}} -{{- set .Values.conf.congress.keystone_authtoken "region_name" .Values.endpoints.identity.auth.congress.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "region_name" .Values.endpoints.identity.auth.congress.region_name -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.project_name -}} -{{- set .Values.conf.congress.keystone_authtoken "project_name" .Values.endpoints.identity.auth.congress.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "project_name" .Values.endpoints.identity.auth.congress.project_name -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.congress.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.congress.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.congress.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.congress.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.congress.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.congress.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.username -}} -{{- set .Values.conf.congress.keystone_authtoken "username" .Values.endpoints.identity.auth.congress.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "username" .Values.endpoints.identity.auth.congress.username -}} {{- end -}} {{- if empty .Values.conf.congress.keystone_authtoken.password -}} -{{- set .Values.conf.congress.keystone_authtoken "password" .Values.endpoints.identity.auth.congress.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.congress.keystone_authtoken "password" .Values.endpoints.identity.auth.congress.password -}} {{- end -}} {{- if empty .Values.conf.congress.DEFAULT.bind_port -}} -{{- tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.congress.DEFAULT "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.congress.DEFAULT "bind_port" -}} {{- end -}} --- diff --git a/doc/source/devref/oslo-config.rst b/doc/source/devref/oslo-config.rst index 6596a9b86d..e5ee26b5f3 100644 --- a/doc/source/devref/oslo-config.rst +++ b/doc/source/devref/oslo-config.rst @@ -77,15 +77,15 @@ performed via statements in the configmap template, which also calls the :: {{- if empty .Values.conf.keystone.database.connection -}} - {{- tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database "connection" | quote | trunc 0 -}} + {{- $_ := tuple "oslo_db" "internal" "user" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database "connection" -}} {{- end -}} {{- if empty .Values.conf.keystone.DEFAULT.transport_url -}} - {{- tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" | quote | trunc 0 -}} + {{- $_ := tuple "oslo_messaging" "internal" "user" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.keystone.cache.memcache_servers -}} - {{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.keystone.cache "memcache_servers" | quote | trunc 0 -}} + {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.keystone.cache "memcache_servers" -}} {{- end -}} --- diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml index 2fcf0d48e8..0070ed86d4 100644 --- a/glance/templates/configmap-etc.yaml +++ b/glance/templates/configmap-etc.yaml @@ -18,130 +18,130 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.glance.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.region_name -}} -{{- set .Values.conf.glance.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.project_name -}} -{{- set .Values.conf.glance.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.glance.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.glance.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.username -}} -{{- set .Values.conf.glance.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.password -}} -{{- set .Values.conf.glance.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.region_name -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.project_name -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.username -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.password -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.glance.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.glance.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.glance_registry.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.glance_registry.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.glance.database.connection -}} -{{- tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance.database "connection" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.connection -}} -{{- tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance_registry.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.glance_registry.database "connection" -}} {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.registry_host -}} {{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} {{- $imageRegistryHostURI := split ":" $imageRegistry -}} -{{- $imageRegistryHostURI._0 | set .Values.conf.glance.DEFAULT "registry_host" | quote | trunc 0 -}} +{{- $_ := $imageRegistryHostURI._0 | set .Values.conf.glance.DEFAULT "registry_host" -}} {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.registry_port -}} {{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} {{- $imageRegistryHostURI := split ":" $imageRegistry -}} -{{- $imageRegistryHostURI._1 | set .Values.conf.glance.DEFAULT "registry_port" | quote | trunc 0 -}} +{{- $_ := $imageRegistryHostURI._1 | set .Values.conf.glance.DEFAULT "registry_port" -}} {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.public_endpoint -}} -{{- tuple "image" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "public_endpoint" | quote | trunc 0 -}} +{{- $_ := tuple "image" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "public_endpoint" -}} {{- end -}} {{- if empty .Values.conf.glance.glance_store.stores -}} {{- if eq .Values.storage "rbd" }} -{{- "file, http, rbd" | set .Values.conf.glance.glance_store "stores" | quote | trunc 0 -}} +{{- $_ := "file, http, rbd" | set .Values.conf.glance.glance_store "stores" -}} {{- end -}} {{- if eq .Values.storage "pvc" }} -{{- "file, http" | set .Values.conf.glance.glance_store "stores" | quote | trunc 0 -}} +{{- $_ := "file, http" | set .Values.conf.glance.glance_store "stores" -}} {{- end -}} {{ if or (eq .Values.storage "radosgw") (eq .Values.storage "swift") }} -{{- "file, http, swift" | set .Values.conf.glance.glance_store "stores" | quote | trunc 0 -}} +{{- $_ := "file, http, swift" | set .Values.conf.glance.glance_store "stores" -}} {{- end -}} {{- end -}} {{- if empty .Values.conf.glance.glance_store.default_store -}} {{- if eq .Values.storage "rbd" }} -{{- "rbd" | set .Values.conf.glance.glance_store "default_store" | quote | trunc 0 -}} +{{- $_ := "rbd" | set .Values.conf.glance.glance_store "default_store" -}} {{- end -}} {{- if eq .Values.storage "pvc" }} -{{- "file" | set .Values.conf.glance.glance_store "default_store" | quote | trunc 0 -}} +{{- $_ := "file" | set .Values.conf.glance.glance_store "default_store" -}} {{- end -}} {{ if or (eq .Values.storage "radosgw") (eq .Values.storage "swift") }} -{{- "swift" | set .Values.conf.glance.glance_store "default_store" | quote | trunc 0 -}} +{{- $_ := "swift" | set .Values.conf.glance.glance_store "default_store" -}} {{- end -}} {{- end -}} {{- if empty .Values.conf.glance.DEFAULT.bind_port -}} -{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance.DEFAULT "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance.DEFAULT "bind_port" -}} {{- end -}} {{- if empty .Values.conf.glance_registry.DEFAULT.bind_port -}} -{{- tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance_registry.DEFAULT "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance_registry.DEFAULT "bind_port" -}} {{- end -}} --- diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml index b09975b7bf..8fec1d2919 100644 --- a/gnocchi/templates/configmap-etc.yaml +++ b/gnocchi/templates/configmap-etc.yaml @@ -17,69 +17,69 @@ limitations under the License. {{- if .Values.manifests.configmap_etc }} {{- if empty .Values.conf.gnocchi.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.gnocchi.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.region_name -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "region_name" .Values.endpoints.identity.auth.gnocchi.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "region_name" .Values.endpoints.identity.auth.gnocchi.region_name -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.project_name -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "project_name" .Values.endpoints.identity.auth.gnocchi.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "project_name" .Values.endpoints.identity.auth.gnocchi.project_name -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.gnocchi.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.gnocchi.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.gnocchi.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.gnocchi.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.username -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "username" .Values.endpoints.identity.auth.gnocchi.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "username" .Values.endpoints.identity.auth.gnocchi.username -}} {{- end -}} {{- if empty .Values.conf.gnocchi.keystone_authtoken.password -}} -{{- set .Values.conf.gnocchi.keystone_authtoken "password" .Values.endpoints.identity.auth.gnocchi.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "password" .Values.endpoints.identity.auth.gnocchi.password -}} {{- end -}} {{- if empty .Values.conf.gnocchi.database.connection -}} -{{- tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.database "connection" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.indexer.url -}} {{ if eq .Values.conf.gnocchi.indexer.driver "postgresql" }} -{{- tuple "oslo_db_postgresql" "internal" "gnocchi" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.indexer "url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db_postgresql" "internal" "gnocchi" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.indexer "url" -}} {{ else }} -{{- tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.indexer "url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.indexer "url" -}} {{ end }} {{- end -}} {{- if empty .Values.conf.gnocchi.statsd.resource_id -}} -{{- uuidv4 | set .Values.conf.gnocchi.statsd "resource_id" | quote | trunc 0 -}} +{{- $_ := uuidv4 | set .Values.conf.gnocchi.statsd "resource_id" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.statsd.user_id -}} -{{- uuidv4 | set .Values.conf.gnocchi.statsd "user_id" | quote | trunc 0 -}} +{{- $_ := uuidv4 | set .Values.conf.gnocchi.statsd "user_id" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.statsd.project_id -}} -{{- uuidv4 | set .Values.conf.gnocchi.statsd "project_id" | quote | trunc 0 -}} +{{- $_ := uuidv4 | set .Values.conf.gnocchi.statsd "project_id" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.api.port -}} -{{- tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.gnocchi.api "port" | quote | trunc 0 -}} +{{- $_ := tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.gnocchi.api "port" -}} {{- end -}} {{- if empty .Values.conf.gnocchi.statsd.port -}} -{{- tuple "metric_statsd" "internal" "statsd" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.gnocchi.statsd "port" | quote | trunc 0 -}} +{{- $_ := tuple "metric_statsd" "internal" "statsd" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.gnocchi.statsd "port" -}} {{- end -}} {{- $envAll := . }} diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index 6790114048..7acde506df 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -18,106 +18,106 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.heat.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.heat.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.region_name -}} -{{- set .Values.conf.heat.keystone_authtoken "region_name" .Values.endpoints.identity.auth.heat.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "region_name" .Values.endpoints.identity.auth.heat.region_name -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.project_name -}} -{{- set .Values.conf.heat.keystone_authtoken "project_name" .Values.endpoints.identity.auth.heat.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "project_name" .Values.endpoints.identity.auth.heat.project_name -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.heat.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.heat.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.heat.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.heat.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.heat.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.heat.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.username -}} -{{- set .Values.conf.heat.keystone_authtoken "username" .Values.endpoints.identity.auth.heat.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "username" .Values.endpoints.identity.auth.heat.username -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.password -}} -{{- set .Values.conf.heat.keystone_authtoken "password" .Values.endpoints.identity.auth.heat.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "password" .Values.endpoints.identity.auth.heat.password -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.region_name -}} -{{- set .Values.conf.heat.trustee "region_name" .Values.endpoints.identity.auth.heat_trustee.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "region_name" .Values.endpoints.identity.auth.heat_trustee.region_name -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.project_name -}} -{{- set .Values.conf.heat.trustee "project_name" .Values.endpoints.identity.auth.heat_trustee.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "project_name" .Values.endpoints.identity.auth.heat_trustee.project_name -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.project_domain_name -}} -{{- set .Values.conf.heat.trustee "project_domain_name" .Values.endpoints.identity.auth.heat_trustee.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "project_domain_name" .Values.endpoints.identity.auth.heat_trustee.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.user_domain_name -}} -{{- set .Values.conf.heat.trustee "user_domain_name" .Values.endpoints.identity.auth.heat_trustee.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "user_domain_name" .Values.endpoints.identity.auth.heat_trustee.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.username -}} -{{- set .Values.conf.heat.trustee "username" .Values.endpoints.identity.auth.heat_trustee.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "username" .Values.endpoints.identity.auth.heat_trustee.username -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.password -}} -{{- set .Values.conf.heat.trustee "password" .Values.endpoints.identity.auth.heat_trustee.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.trustee "password" .Values.endpoints.identity.auth.heat_trustee.password -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.stack_user_domain_name -}} -{{- set .Values.conf.heat.DEFAULT "stack_user_domain_name" .Values.endpoints.identity.auth.heat_stack_user.domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.DEFAULT "stack_user_domain_name" .Values.endpoints.identity.auth.heat_stack_user.domain_name -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.stack_domain_admin -}} -{{- set .Values.conf.heat.DEFAULT "stack_domain_admin" .Values.endpoints.identity.auth.heat_stack_user.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.DEFAULT "stack_domain_admin" .Values.endpoints.identity.auth.heat_stack_user.username -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.stack_domain_admin_password -}} -{{- set .Values.conf.heat.DEFAULT "stack_domain_admin_password" .Values.endpoints.identity.auth.heat_stack_user.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.DEFAULT "stack_domain_admin_password" .Values.endpoints.identity.auth.heat_stack_user.password -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.heat.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.heat.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.heat.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.heat.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.heat.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.heat.database.connection -}} -{{- tuple "oslo_db" "internal" "heat" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.heat.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "heat" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.heat.database "connection" -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "heat" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.heat.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "heat" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.heat.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.heat_metadata_server_url -}} -{{- tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.cloudformation.path.default | set .Values.conf.heat.DEFAULT "heat_metadata_server_url" | quote | trunc 0 -}} +{{- $_ := tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.cloudformation.path.default | set .Values.conf.heat.DEFAULT "heat_metadata_server_url" -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.heat_waitcondition_server_url -}} -{{- cat (tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup") "waitcondition" | replace " " "/" | set .Values.conf.heat.DEFAULT "heat_waitcondition_server_url" | quote | trunc 0 -}} +{{- $_ := cat (tuple "cloudformation" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup") "waitcondition" | replace " " "/" | set .Values.conf.heat.DEFAULT "heat_waitcondition_server_url" -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.heat_watch_server_url -}} -{{- tuple "cloudwatch" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" | set .Values.conf.heat.DEFAULT "heat_watch_server_url" | quote | trunc 0 -}} +{{- $_ := tuple "cloudwatch" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix "/" | set .Values.conf.heat.DEFAULT "heat_watch_server_url" -}} {{- end -}} {{- if empty .Values.conf.heat.clients_keystone.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.clients_keystone "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.clients_keystone "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.heat.trustee.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.trustee "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | set .Values.conf.heat.trustee "auth_url" -}} {{- end -}} {{- if empty .Values.conf.heat.heat_api.bind_port -}} -{{- tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "orchestration" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api "bind_port" -}} {{- end -}} {{- if empty .Values.conf.heat.heat_api_cloudwatch.bind_port -}} -{{- tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cloudwatch "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "cloudwatch" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cloudwatch "bind_port" -}} {{- end -}} {{- if empty .Values.conf.heat.heat_api_cfn.bind_port -}} -{{- tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cfn "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "cloudformation" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.heat.heat_api_cfn "bind_port" -}} {{- end -}} --- diff --git a/ingress/templates/configmap-conf.yaml b/ingress/templates/configmap-conf.yaml index cedfcd2b89..730a57c748 100644 --- a/ingress/templates/configmap-conf.yaml +++ b/ingress/templates/configmap-conf.yaml @@ -19,7 +19,7 @@ limitations under the License. {{- if and .Values.network.host_namespace .Values.network.vip.manage -}} {{- if empty (index .Values.conf.ingress "bind-address") -}} -{{- set .Values.conf.ingress "bind-address" ( .Values.network.vip.addr | split "/" )._0 | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ingress "bind-address" ( .Values.network.vip.addr | split "/" )._0 }} {{- end -}} {{- end -}} diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index fc510b819d..0d0191c790 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- if empty .Values.conf.controller.INGRESS_CLASS -}} {{- if eq .Values.deployment.mode "cluster" }} -{{- set .Values.conf.controller "INGRESS_CLASS" .Values.deployment.cluster.class | quote | trunc 0 -}} +{{- $_ := set .Values.conf.controller "INGRESS_CLASS" .Values.deployment.cluster.class -}} {{- else if eq .Values.deployment.mode "namespace" }} -{{- set .Values.conf.controller "INGRESS_CLASS" "nginx" | quote | trunc 0 -}} +{{- $_ := set .Values.conf.controller "INGRESS_CLASS" "nginx" -}} {{- end }} {{- end -}} diff --git a/ingress/templates/ingress.yaml b/ingress/templates/ingress.yaml index 0882d5bc7d..16ebaab3d5 100644 --- a/ingress/templates/ingress.yaml +++ b/ingress/templates/ingress.yaml @@ -18,7 +18,7 @@ limitations under the License. {{- $envAll := . }} {{- if eq .Values.deployment.mode "namespace" }} {{- if empty (index .Values.network.ingress.annotations "kubernetes.io/ingress.class") -}} -{{- set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class | quote | trunc 0 -}} +{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}} {{- end -}} --- apiVersion: extensions/v1beta1 diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml index d8a6487fa9..d9fff06223 100644 --- a/ironic/templates/configmap-etc.yaml +++ b/ironic/templates/configmap-etc.yaml @@ -18,170 +18,170 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.ironic.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.region_name -}} -{{- set .Values.conf.ironic.keystone_authtoken "region_name" .Values.endpoints.identity.auth.ironic.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "region_name" .Values.endpoints.identity.auth.ironic.region_name -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.project_name -}} -{{- set .Values.conf.ironic.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.ironic.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.ironic.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.username -}} -{{- set .Values.conf.ironic.keystone_authtoken "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.password -}} -{{- set .Values.conf.ironic.keystone_authtoken "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ironic.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ironic.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.ironic.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.ironic.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.ironic.database.connection -}} -{{- tuple "oslo_db" "internal" "ironic" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ironic.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "ironic" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ironic.database "connection" -}} {{- end -}} {{- if empty .Values.conf.ironic.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "ironic" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ironic.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "ironic" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.ironic.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.glance_host -}} -{{- tuple "image" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup"| set .Values.conf.ironic.glance "glance_host" | quote | trunc 0 -}} +{{- $_ := tuple "image" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup"| set .Values.conf.ironic.glance "glance_host" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.glance_port -}} -{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup"| set .Values.conf.ironic.glance "glance_port" | quote | trunc 0 -}} +{{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup"| set .Values.conf.ironic.glance "glance_port" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.glance "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.glance "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.project_name -}} -{{- set .Values.conf.ironic.glance "project_name" .Values.endpoints.identity.auth.glance.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "project_name" .Values.endpoints.identity.auth.glance.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.project_domain_name -}} -{{- set .Values.conf.ironic.glance "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.user_domain_name -}} -{{- set .Values.conf.ironic.glance "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.username -}} -{{- set .Values.conf.ironic.glance "username" .Values.endpoints.identity.auth.glance.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "username" .Values.endpoints.identity.auth.glance.username -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.password -}} -{{- set .Values.conf.ironic.glance "password" .Values.endpoints.identity.auth.glance.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "password" .Values.endpoints.identity.auth.glance.password -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.inspector "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.inspector "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.project_name -}} -{{- set .Values.conf.ironic.inspector "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.inspector "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.project_domain_name -}} -{{- set .Values.conf.ironic.inspector "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.inspector "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.user_domain_name -}} -{{- set .Values.conf.ironic.inspector "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.inspector "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.username -}} -{{- set .Values.conf.ironic.inspector "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.inspector "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.ironic.inspector.password -}} -{{- set .Values.conf.ironic.inspector "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.inspector "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.url -}} -{{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.neutron "url" | quote | trunc 0 -}} +{{- $_ := tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.neutron "url" -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.neutron "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.neutron "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.project_name -}} -{{- set .Values.conf.ironic.neutron "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.neutron "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.project_domain_name -}} -{{- set .Values.conf.ironic.neutron "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.neutron "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.user_domain_name -}} -{{- set .Values.conf.ironic.neutron "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.neutron "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.username -}} -{{- set .Values.conf.ironic.neutron "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.neutron "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.ironic.neutron.password -}} -{{- set .Values.conf.ironic.neutron "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.neutron "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.service_catalog "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.service_catalog "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.project_name -}} -{{- set .Values.conf.ironic.service_catalog "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.service_catalog "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.project_domain_name -}} -{{- set .Values.conf.ironic.service_catalog "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.service_catalog "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.user_domain_name -}} -{{- set .Values.conf.ironic.service_catalog "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.service_catalog "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.username -}} -{{- set .Values.conf.ironic.service_catalog "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.service_catalog "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.ironic.service_catalog.password -}} -{{- set .Values.conf.ironic.service_catalog "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.service_catalog "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.swift "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.swift "auth_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.project_name -}} -{{- set .Values.conf.ironic.swift "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.swift "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.project_domain_name -}} -{{- set .Values.conf.ironic.swift "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.swift "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.user_domain_name -}} -{{- set .Values.conf.ironic.swift "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.swift "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.username -}} -{{- set .Values.conf.ironic.swift "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.swift "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.ironic.swift.password -}} -{{- set .Values.conf.ironic.swift "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.swift "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.ironic.conductor.api_url -}} -{{- tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.conductor "api_url" | quote | trunc 0 -}} +{{- $_ := tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.conductor "api_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.api.public_endpoint -}} -{{- tuple "baremetal" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.api "public_endpoint" | quote | trunc 0 -}} +{{- $_ := tuple "baremetal" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ironic.api "public_endpoint" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.swift_endpoint_url -}} -{{- tuple "object_store" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| trimSuffix .Values.endpoints.object_store.path.default | set .Values.conf.ironic.glance "swift_endpoint_url" | quote | trunc 0 -}} +{{- $_ := tuple "object_store" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| trimSuffix .Values.endpoints.object_store.path.default | set .Values.conf.ironic.glance "swift_endpoint_url" -}} {{- end -}} {{- if empty .Values.conf.ironic.glance.swift_temp_url_key -}} -{{- set .Values.conf.ironic.glance "swift_temp_url_key" .Values.endpoints.object_store.auth.glance.tmpurlkey | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.glance "swift_temp_url_key" .Values.endpoints.object_store.auth.glance.tmpurlkey -}} {{- end -}} {{- if empty .Values.conf.ironic.api.port -}} -{{- set .Values.conf.ironic.api "port" (tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup") | quote | trunc 0 -}} +{{- $_ := set .Values.conf.ironic.api "port" (tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup") -}} {{- end -}} --- diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml index a6116d07af..9582c0dd9f 100644 --- a/keystone/templates/configmap-etc.yaml +++ b/keystone/templates/configmap-etc.yaml @@ -18,15 +18,15 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.keystone.database.connection -}} -{{- tuple "oslo_db" "internal" "keystone" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "keystone" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.keystone.database "connection" -}} {{- end -}} {{- if empty .Values.conf.keystone.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "keystone" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "keystone" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.keystone.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.keystone.cache.memcache_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.keystone.cache "memcache_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.keystone.cache "memcache_servers" -}} {{- end -}} --- diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml index baab9a0595..98bbaaad10 100644 --- a/magnum/templates/configmap-etc.yaml +++ b/magnum/templates/configmap-etc.yaml @@ -18,59 +18,59 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.magnum.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.magnum.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.region_name -}} -{{- set .Values.conf.magnum.keystone_authtoken "region_name" .Values.endpoints.identity.auth.magnum.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "region_name" .Values.endpoints.identity.auth.magnum.region_name -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.project_name -}} -{{- set .Values.conf.magnum.keystone_authtoken "project_name" .Values.endpoints.identity.auth.magnum.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "project_name" .Values.endpoints.identity.auth.magnum.project_name -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.magnum.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.magnum.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.magnum.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.magnum.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.magnum.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.magnum.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.username -}} -{{- set .Values.conf.magnum.keystone_authtoken "username" .Values.endpoints.identity.auth.magnum.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "username" .Values.endpoints.identity.auth.magnum.username -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.password -}} -{{- set .Values.conf.magnum.keystone_authtoken "password" .Values.endpoints.identity.auth.magnum.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "password" .Values.endpoints.identity.auth.magnum.password -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.magnum.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.magnum.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.magnum.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.magnum.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.magnum.database.connection -}} -{{- tuple "oslo_db" "internal" "magnum" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.magnum.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "magnum" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.magnum.database "connection" -}} {{- end -}} {{- if empty .Values.conf.magnum.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "magnum" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.magnum.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "magnum" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.magnum.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.magnum.api.port -}} -{{- tuple "container-infra" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.magnum.api "port" | quote | trunc 0 -}} +{{- $_ := tuple "container-infra" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.magnum.api "port" -}} {{- end -}} {{- if empty .Values.conf.magnum.trust.trustee_domain_name -}} -{{- set .Values.conf.magnum.trust "trustee_domain_name" .Values.endpoints.identity.auth.magnum_stack_user.domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.trust "trustee_domain_name" .Values.endpoints.identity.auth.magnum_stack_user.domain_name -}} {{- end -}} {{- if empty .Values.conf.magnum.trust.trustee_domain_admin_name -}} -{{- set .Values.conf.magnum.trust "trustee_domain_admin_name" .Values.endpoints.identity.auth.magnum_stack_user.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.trust "trustee_domain_admin_name" .Values.endpoints.identity.auth.magnum_stack_user.username -}} {{- end -}} {{- if empty .Values.conf.magnum.trust.trustee_domain_admin_password -}} -{{- set .Values.conf.magnum.trust "trustee_domain_admin_password" .Values.endpoints.identity.auth.magnum_stack_user.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.magnum.trust "trustee_domain_admin_password" .Values.endpoints.identity.auth.magnum_stack_user.password -}} {{- end -}} --- diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml index 30afc8f284..53dde0e0e3 100644 --- a/mistral/templates/configmap-etc.yaml +++ b/mistral/templates/configmap-etc.yaml @@ -18,49 +18,49 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.mistral.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.mistral.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.region_name -}} -{{- set .Values.conf.mistral.keystone_authtoken "region_name" .Values.endpoints.identity.auth.mistral.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "region_name" .Values.endpoints.identity.auth.mistral.region_name -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.project_name -}} -{{- set .Values.conf.mistral.keystone_authtoken "project_name" .Values.endpoints.identity.auth.mistral.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "project_name" .Values.endpoints.identity.auth.mistral.project_name -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.mistral.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.mistral.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.mistral.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.mistral.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.mistral.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.mistral.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.username -}} -{{- set .Values.conf.mistral.keystone_authtoken "username" .Values.endpoints.identity.auth.mistral.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "username" .Values.endpoints.identity.auth.mistral.username -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.password -}} -{{- set .Values.conf.mistral.keystone_authtoken "password" .Values.endpoints.identity.auth.mistral.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "password" .Values.endpoints.identity.auth.mistral.password -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.mistral.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.mistral.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.mistral.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.mistral.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.mistral.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.mistral.database.connection -}} -{{- tuple "oslo_db" "internal" "mistral" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "mistral" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.mistral.database "connection" -}} {{- end -}} {{- if empty .Values.conf.mistral.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "mistral" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "mistral" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.mistral.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.mistral.api.port -}} -{{- tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.mistral.api "port" | quote | trunc 0 -}} +{{- $_ := tuple "workflowv2" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.mistral.api "port" -}} {{- end -}} --- diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index d780aa16c3..282cc73bfd 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -20,68 +20,68 @@ limitations under the License. {{- with $envAll }} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.keystone_authtoken "auth_uri" -}} {{- end }} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.keystone_authtoken "auth_url" -}} {{- end }} {{- if empty .Values.conf.neutron.keystone_authtoken.project_name -}} -{{- set .Values.conf.neutron.keystone_authtoken "project_name" .Values.endpoints.identity.auth.neutron.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.neutron.keystone_authtoken "project_name" .Values.endpoints.identity.auth.neutron.project_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.project_domain_name -}} -{{- set $envAll.Values.conf.neutron.keystone_authtoken "project_domain_name" $envAll.Values.endpoints.identity.auth.neutron.project_domain_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.keystone_authtoken "project_domain_name" $envAll.Values.endpoints.identity.auth.neutron.project_domain_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.user_domain_name -}} -{{- set $envAll.Values.conf.neutron.keystone_authtoken "user_domain_name" $envAll.Values.endpoints.identity.auth.neutron.user_domain_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.keystone_authtoken "user_domain_name" $envAll.Values.endpoints.identity.auth.neutron.user_domain_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.username -}} -{{- set $envAll.Values.conf.neutron.keystone_authtoken "username" $envAll.Values.endpoints.identity.auth.neutron.username | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.keystone_authtoken "username" $envAll.Values.endpoints.identity.auth.neutron.username -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.password -}} -{{- set $envAll.Values.conf.neutron.keystone_authtoken "password" $envAll.Values.endpoints.identity.auth.neutron.password | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.keystone_authtoken "password" $envAll.Values.endpoints.identity.auth.neutron.password -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.region_name -}} -{{- set $envAll.Values.conf.neutron.keystone_authtoken "region_name" $envAll.Values.endpoints.identity.auth.neutron.region_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.keystone_authtoken "region_name" $envAll.Values.endpoints.identity.auth.neutron.region_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.keystone_authtoken "memcached_servers" -}} {{- end }} {{- if empty .Values.conf.neutron.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.neutron.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.neutron.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.database.connection -}} -{{- tuple "oslo_db" "internal" "neutron" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "neutron" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.database "connection" -}} {{- end }} {{- if empty $envAll.Values.conf.neutron.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "neutron" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "neutron" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set $envAll.Values.conf.neutron.DEFAULT "transport_url" -}} {{- end }} {{- if empty $envAll.Values.conf.neutron.nova.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.nova "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.nova "auth_url" -}} {{- end }} {{- if empty $envAll.Values.conf.neutron.nova.region_name -}} -{{- set $envAll.Values.conf.neutron.nova "region_name" $envAll.Values.endpoints.identity.auth.nova.region_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "region_name" $envAll.Values.endpoints.identity.auth.nova.region_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.nova.project_name -}} -{{- set $envAll.Values.conf.neutron.nova "project_name" $envAll.Values.endpoints.identity.auth.nova.project_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "project_name" $envAll.Values.endpoints.identity.auth.nova.project_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.nova.project_domain_name -}} -{{- set $envAll.Values.conf.neutron.nova "project_domain_name" $envAll.Values.endpoints.identity.auth.nova.project_domain_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "project_domain_name" $envAll.Values.endpoints.identity.auth.nova.project_domain_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.nova.user_domain_name -}} -{{- set $envAll.Values.conf.neutron.nova "user_domain_name" $envAll.Values.endpoints.identity.auth.nova.user_domain_name | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "user_domain_name" $envAll.Values.endpoints.identity.auth.nova.user_domain_name -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.nova.username -}} -{{- set $envAll.Values.conf.neutron.nova "username" $envAll.Values.endpoints.identity.auth.nova.username | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "username" $envAll.Values.endpoints.identity.auth.nova.username -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.nova.password -}} -{{- set $envAll.Values.conf.neutron.nova "password" $envAll.Values.endpoints.identity.auth.nova.password | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.nova "password" $envAll.Values.endpoints.identity.auth.nova.password -}} {{- end -}} {{/* @@ -89,16 +89,16 @@ nova_metadata_ip can go away when Newton is no longer supported, otherwise just set it along with nova_metadata_host. */}} {{- if empty $envAll.Values.conf.metadata_agent.DEFAULT.nova_metadata_ip -}} -{{- tuple "compute_metadata" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_ip" | quote | trunc 0 -}} +{{- $_ := tuple "compute_metadata" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_ip" -}} {{- end -}} {{- if empty $envAll.Values.conf.metadata_agent.DEFAULT.nova_metadata_host -}} -{{- tuple "compute_metadata" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_host" | quote | trunc 0 -}} +{{- $_ := tuple "compute_metadata" "public" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_host" -}} {{- end -}} {{- if empty $envAll.Values.conf.metadata_agent.DEFAULT.nova_metadata_port -}} -{{- set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_port" 80 | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_port" 80 -}} {{- end -}} {{- if empty $envAll.Values.conf.metadata_agent.cache.memcache_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.metadata_agent.cache "memcache_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.metadata_agent.cache "memcache_servers" -}} {{- end -}} {{- if empty $envAll.Values.conf.neutron.DEFAULT.interface_driver -}} @@ -111,7 +111,7 @@ just set it along with nova_metadata_host. {{ $__interface_driver := append $envAll.Values.__interface_driver "linuxbridge" }} {{- $_ := set $envAll.Values "__interface_driver" $__interface_driver }} {{- end -}} -{{- set $envAll.Values.conf.neutron.DEFAULT "interface_driver" $envAll.Values.__interface_driver | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.neutron.DEFAULT "interface_driver" $envAll.Values.__interface_driver -}} {{- end -}} {{- if empty $envAll.Values.conf.dhcp_agent.DEFAULT.interface_driver -}} @@ -124,7 +124,7 @@ just set it along with nova_metadata_host. {{ $__interface_driver := append $envAll.Values.__interface_driver "linuxbridge" }} {{- $_ := set $envAll.Values "__interface_driver" $__interface_driver }} {{- end -}} -{{- set $envAll.Values.conf.dhcp_agent.DEFAULT "interface_driver" $envAll.Values.__interface_driver | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.dhcp_agent.DEFAULT "interface_driver" $envAll.Values.__interface_driver -}} {{- end -}} {{- if empty $envAll.Values.conf.l3_agent.DEFAULT.interface_driver -}} @@ -137,7 +137,7 @@ just set it along with nova_metadata_host. {{ $__interface_driver := append $envAll.Values.__interface_driver "linuxbridge" }} {{- $_ := set $envAll.Values "__interface_driver" $__interface_driver }} {{- end -}} -{{- set $envAll.Values.conf.l3_agent.DEFAULT "interface_driver" $envAll.Values.__interface_driver | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.l3_agent.DEFAULT "interface_driver" $envAll.Values.__interface_driver -}} {{- end -}} {{- if empty $envAll.Values.conf.plugins.ml2_conf.ml2.mechanism_drivers -}} @@ -150,11 +150,11 @@ just set it along with nova_metadata_host. {{ $__mechanism_drivers := append $envAll.Values.__mechanism_drivers "linuxbridge" }} {{- $_ := set $envAll.Values "__mechanism_drivers" $__mechanism_drivers }} {{- end -}} -{{- set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" $envAll.Values.__mechanism_drivers | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" $envAll.Values.__mechanism_drivers -}} {{- end -}} {{- if empty .Values.conf.neutron.DEFAULT.bind_port -}} -{{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.neutron.DEFAULT "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.neutron.DEFAULT "bind_port" -}} {{- end -}} --- diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml index 0d1d9f958d..40983eb852 100644 --- a/nova/templates/configmap-etc.yaml +++ b/nova/templates/configmap-etc.yaml @@ -20,184 +20,184 @@ limitations under the License. {{- with $envAll }} {{- if empty .Values.conf.nova.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.region_name -}} -{{- set .Values.conf.nova.keystone_authtoken "region_name" .Values.endpoints.identity.auth.nova.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "region_name" .Values.endpoints.identity.auth.nova.region_name -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.project_name -}} -{{- set .Values.conf.nova.keystone_authtoken "project_name" .Values.endpoints.identity.auth.nova.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "project_name" .Values.endpoints.identity.auth.nova.project_name -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.nova.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.nova.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.nova.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.nova.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.nova.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.nova.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.username -}} -{{- set .Values.conf.nova.keystone_authtoken "username" .Values.endpoints.identity.auth.nova.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "username" .Values.endpoints.identity.auth.nova.username -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.password -}} -{{- set .Values.conf.nova.keystone_authtoken "password" .Values.endpoints.identity.auth.nova.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "password" .Values.endpoints.identity.auth.nova.password -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.nova.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.nova.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.nova.database.connection -}} -{{- tuple "oslo_db" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.database "connection" -}} {{- end -}} {{- if empty .Values.conf.nova.api_database.connection -}} -{{- tuple "oslo_db_api" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.api_database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db_api" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.api_database "connection" -}} {{- end -}} {{- if empty .Values.conf.nova.cell0_database.connection -}} -{{- tuple "oslo_db_cell0" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.cell0_database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db_cell0" "internal" "nova" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.cell0_database "connection" -}} {{- end -}} {{- if empty .Values.conf.nova.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "nova" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "nova" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.nova.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.nova.glance.api_servers -}} -{{- tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.glance "api_servers" | quote | trunc 0 -}} +{{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.glance "api_servers" -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.url -}} -{{- tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.neutron "url" | quote | trunc 0 -}} +{{- $_ := tuple "network" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.neutron "url" -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.neutron "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.neutron "auth_url" -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.region_name -}} -{{- set .Values.conf.nova.neutron "region_name" .Values.endpoints.identity.auth.neutron.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "region_name" .Values.endpoints.identity.auth.neutron.region_name -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.project_name -}} -{{- set .Values.conf.nova.neutron "project_name" .Values.endpoints.identity.auth.neutron.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "project_name" .Values.endpoints.identity.auth.neutron.project_name -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.project_domain_name -}} -{{- set .Values.conf.nova.neutron "project_domain_name" .Values.endpoints.identity.auth.neutron.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "project_domain_name" .Values.endpoints.identity.auth.neutron.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.user_domain_name -}} -{{- set .Values.conf.nova.neutron "user_domain_name" .Values.endpoints.identity.auth.neutron.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "user_domain_name" .Values.endpoints.identity.auth.neutron.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.username -}} -{{- set .Values.conf.nova.neutron "username" .Values.endpoints.identity.auth.neutron.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "username" .Values.endpoints.identity.auth.neutron.username -}} {{- end -}} {{- if empty .Values.conf.nova.neutron.password -}} -{{- set .Values.conf.nova.neutron "password" .Values.endpoints.identity.auth.neutron.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.neutron "password" .Values.endpoints.identity.auth.neutron.password -}} {{- end -}} {{- if empty .Values.conf.nova.cache.memcache_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache "memcache_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache "memcache_servers" -}} {{- end -}} {{- if and (empty .Values.conf.nova.DEFAULT.metadata_host) .Values.endpoints.compute_metadata.ip.ingress -}} -{{- set .Values.conf.nova.DEFAULT "metadata_host" .Values.endpoints.compute_metadata.ip.ingress | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.DEFAULT "metadata_host" .Values.endpoints.compute_metadata.ip.ingress -}} {{- end -}} {{- if empty .Values.conf.nova.DEFAULT.metadata_port -}} -{{- tuple "compute_metadata" "public" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "metadata_port" | quote | trunc 0 -}} +{{- $_ := tuple "compute_metadata" "public" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "metadata_port" -}} {{- end -}} {{- if empty .Values.conf.nova.placement.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.placement "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.placement "auth_url" -}} {{- end -}} {{- if empty .Values.conf.nova.placement.os_region_name -}} -{{- set .Values.conf.nova.placement "os_region_name" .Values.endpoints.identity.auth.placement.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "os_region_name" .Values.endpoints.identity.auth.placement.region_name -}} {{- end -}} {{- if empty .Values.conf.nova.placement.project_name -}} -{{- set .Values.conf.nova.placement "project_name" .Values.endpoints.identity.auth.placement.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "project_name" .Values.endpoints.identity.auth.placement.project_name -}} {{- end -}} {{- if empty .Values.conf.nova.placement.project_domain_name -}} -{{- set .Values.conf.nova.placement "project_domain_name" .Values.endpoints.identity.auth.placement.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "project_domain_name" .Values.endpoints.identity.auth.placement.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.placement.user_domain_name -}} -{{- set .Values.conf.nova.placement "user_domain_name" .Values.endpoints.identity.auth.placement.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "user_domain_name" .Values.endpoints.identity.auth.placement.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.placement.username -}} -{{- set .Values.conf.nova.placement "username" .Values.endpoints.identity.auth.placement.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "username" .Values.endpoints.identity.auth.placement.username -}} {{- end -}} {{- if empty .Values.conf.nova.placement.password -}} -{{- set .Values.conf.nova.placement "password" .Values.endpoints.identity.auth.placement.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.placement "password" .Values.endpoints.identity.auth.placement.password -}} {{- end -}} {{- if eq .Values.console.console_kind "novnc"}} -{{- "true" | set .Values.conf.nova.vnc "enabled" | quote | trunc 0 -}} +{{- $_ := "true" | set .Values.conf.nova.vnc "enabled" -}} {{- if empty .Values.conf.nova.vnc.novncproxy_base_url -}} -{{- tuple "compute_novnc_proxy" "public" "novnc_proxy" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.vnc "novncproxy_base_url" | quote | trunc 0 -}} +{{- $_ := tuple "compute_novnc_proxy" "public" "novnc_proxy" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.vnc "novncproxy_base_url" -}} {{- end -}} {{- if empty .Values.conf.nova.vnc.novncproxy_port -}} -{{- tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.vnc "novncproxy_port" | quote | trunc 0 -}} +{{- $_ := tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.vnc "novncproxy_port" -}} {{- end -}} {{- end -}} {{- if eq .Values.console.console_kind "spice"}} -{{- "false" | set .Values.conf.nova.vnc "enabled" | quote | trunc 0 -}} -{{- "true" | set .Values.conf.nova.spice "enabled" | quote | trunc 0 -}} +{{- $_ := "false" | set .Values.conf.nova.vnc "enabled" -}} +{{- $_ := "true" | set .Values.conf.nova.spice "enabled" -}} {{- if empty .Values.conf.nova.spice.html5proxy_base_url -}} -{{- tuple "compute_spice_proxy" "public" "spice_proxy" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.spice "html5proxy_base_url" | quote | trunc 0 -}} +{{- $_ := tuple "compute_spice_proxy" "public" "spice_proxy" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.spice "html5proxy_base_url" -}} {{- end -}} {{- if empty .Values.conf.nova.spice.html5proxy_port -}} -{{- tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.spice "html5proxy_port" | quote | trunc 0 -}} +{{- $_ := tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.spice "html5proxy_port" -}} {{- end -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.api_endpoint -}} -{{- tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.ironic "api_endpoint" | quote | trunc 0 -}} +{{- $_ := tuple "baremetal" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.ironic "api_endpoint" -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.ironic "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.nova.ironic "auth_url" -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.region_name -}} -{{- set .Values.conf.nova.ironic "region_name" .Values.endpoints.identity.auth.ironic.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "region_name" .Values.endpoints.identity.auth.ironic.region_name -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.project_name -}} -{{- set .Values.conf.nova.ironic "project_name" .Values.endpoints.identity.auth.ironic.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "project_name" .Values.endpoints.identity.auth.ironic.project_name -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.project_domain_name -}} -{{- set .Values.conf.nova.ironic "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "project_domain_name" .Values.endpoints.identity.auth.ironic.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.user_domain_name -}} -{{- set .Values.conf.nova.ironic "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "user_domain_name" .Values.endpoints.identity.auth.ironic.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.username -}} -{{- set .Values.conf.nova.ironic "username" .Values.endpoints.identity.auth.ironic.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "username" .Values.endpoints.identity.auth.ironic.username -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.password -}} -{{- set .Values.conf.nova.ironic "password" .Values.endpoints.identity.auth.ironic.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "password" .Values.endpoints.identity.auth.ironic.password -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.auth_type -}} -{{- set .Values.conf.nova.ironic "auth_type" .Values.endpoints.identity.auth.ironic.auth_type | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "auth_type" .Values.endpoints.identity.auth.ironic.auth_type -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.auth_version -}} -{{- set .Values.conf.nova.ironic "auth_version" .Values.endpoints.identity.auth.ironic.auth_version | quote | trunc 0 -}} +{{- $_ := set .Values.conf.nova.ironic "auth_version" .Values.endpoints.identity.auth.ironic.auth_version -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.memcache_secret_key -}} -{{- randAlphaNum 64 | set .Values.conf.nova.ironic "memcache_secret_key" | quote | trunc 0 -}} +{{- $_ := randAlphaNum 64 | set .Values.conf.nova.ironic "memcache_secret_key" -}} {{- end -}} {{- if empty .Values.conf.nova.ironic.memcache_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.ironic "memcache_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.ironic "memcache_servers" -}} {{- end -}} {{- if empty .Values.conf.nova.DEFAULT.osapi_compute_listen_port -}} -{{- tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "osapi_compute_listen_port" | quote | trunc 0 -}} +{{- $_ := tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "osapi_compute_listen_port" -}} {{- end -}} --- diff --git a/rabbitmq/templates/configmap-etc.yaml b/rabbitmq/templates/configmap-etc.yaml index 5eef45aff3..b0aa914883 100644 --- a/rabbitmq/templates/configmap-etc.yaml +++ b/rabbitmq/templates/configmap-etc.yaml @@ -18,16 +18,16 @@ limitations under the License. {{- $envAll := . }} {{- if empty $envAll.Values.conf.rabbitmq.cluster_formation.k8s.host -}} -{{- print "kubernetes.default.svc." $envAll.Values.endpoints.cluster_domain_suffix | set $envAll.Values.conf.rabbitmq.cluster_formation.k8s "host" | quote | trunc 0 -}} +{{- $_ := print "kubernetes.default.svc." $envAll.Values.endpoints.cluster_domain_suffix | set $envAll.Values.conf.rabbitmq.cluster_formation.k8s "host" -}} {{- end -}} -{{- print "0.0.0.0:" ( tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") | set $envAll.Values.conf.rabbitmq.listeners.tcp "1" | quote | trunc 0 -}} +{{- $_ := print "0.0.0.0:" ( tuple "oslo_messaging" "internal" "amqp" . | include "helm-toolkit.endpoints.endpoint_port_lookup") | set $envAll.Values.conf.rabbitmq.listeners.tcp "1" -}} {{- if empty $envAll.Values.conf.rabbitmq.default_user -}} -{{- set $envAll.Values.conf.rabbitmq "default_user" $envAll.Values.endpoints.oslo_messaging.auth.user.username | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.rabbitmq "default_user" $envAll.Values.endpoints.oslo_messaging.auth.user.username -}} {{- end -}} {{- if empty $envAll.Values.conf.rabbitmq.default_pass -}} -{{- set $envAll.Values.conf.rabbitmq "default_pass" $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote | trunc 0 -}} +{{- $_ := set $envAll.Values.conf.rabbitmq "default_pass" $envAll.Values.endpoints.oslo_messaging.auth.user.password -}} {{- end -}} --- diff --git a/rally/templates/configmap-etc.yaml b/rally/templates/configmap-etc.yaml index c6fb44e04e..afa651f1a9 100644 --- a/rally/templates/configmap-etc.yaml +++ b/rally/templates/configmap-etc.yaml @@ -17,39 +17,39 @@ limitations under the License. {{- if .Values.manifests.configmap_etc }} {{- $envAll := . }} {{- if empty .Values.conf.rally.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.rally.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.rally.keystone_authtoken "auth_uri" -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.rally.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.rally.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.region_name -}} -{{- set .Values.conf.rally.keystone_authtoken "region_name" .Values.endpoints.identity.auth.rally.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "region_name" .Values.endpoints.identity.auth.rally.region_name -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.project_name -}} -{{- set .Values.conf.rally.keystone_authtoken "project_name" .Values.endpoints.identity.auth.rally.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "project_name" .Values.endpoints.identity.auth.rally.project_name -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.rally.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.rally.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.rally.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.rally.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.rally.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.rally.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.username -}} -{{- set .Values.conf.rally.keystone_authtoken "username" .Values.endpoints.identity.auth.rally.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "username" .Values.endpoints.identity.auth.rally.username -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.password -}} -{{- set .Values.conf.rally.keystone_authtoken "password" .Values.endpoints.identity.auth.rally.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "password" .Values.endpoints.identity.auth.rally.password -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.rally.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.rally.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.rally.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.rally.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.rally.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.rally.database.connection -}} -{{- tuple "oslo_db" "internal" "rally" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.rally.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "rally" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.rally.database "connection" -}} {{- end -}} --- diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml index 88f5cc406d..f2086d129f 100644 --- a/senlin/templates/configmap-etc.yaml +++ b/senlin/templates/configmap-etc.yaml @@ -18,69 +18,69 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.senlin.keystone_authtoken.auth_uri -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken "auth_uri" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken "auth_uri" -}} {{- end -}} # FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future {{- if empty .Values.conf.senlin.keystone_authtoken.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.senlin.keystone_authtoken "auth_url" -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.region_name -}} -{{- set .Values.conf.senlin.keystone_authtoken "region_name" .Values.endpoints.identity.auth.senlin.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "region_name" .Values.endpoints.identity.auth.senlin.region_name -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.project_name -}} -{{- set .Values.conf.senlin.keystone_authtoken "project_name" .Values.endpoints.identity.auth.senlin.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "project_name" .Values.endpoints.identity.auth.senlin.project_name -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.project_domain_name -}} -{{- set .Values.conf.senlin.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.senlin.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.senlin.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.user_domain_name -}} -{{- set .Values.conf.senlin.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.senlin.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.senlin.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.username -}} -{{- set .Values.conf.senlin.keystone_authtoken "username" .Values.endpoints.identity.auth.senlin.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "username" .Values.endpoints.identity.auth.senlin.username -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.password -}} -{{- set .Values.conf.senlin.keystone_authtoken "password" .Values.endpoints.identity.auth.senlin.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "password" .Values.endpoints.identity.auth.senlin.password -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.memcached_servers -}} -{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.senlin.keystone_authtoken "memcached_servers" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.senlin.keystone_authtoken "memcached_servers" -}} {{- end -}} {{- if empty .Values.conf.senlin.keystone_authtoken.memcache_secret_key -}} -{{- set .Values.conf.senlin.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} {{- if empty .Values.conf.senlin.database.connection -}} -{{- tuple "oslo_db" "internal" "senlin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.senlin.database "connection" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_db" "internal" "senlin" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.senlin.database "connection" -}} {{- end -}} {{- if empty .Values.conf.senlin.DEFAULT.transport_url -}} -{{- tuple "oslo_messaging" "internal" "senlin" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.DEFAULT "transport_url" | quote | trunc 0 -}} +{{- $_ := tuple "oslo_messaging" "internal" "senlin" "amqp" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.senlin.DEFAULT "transport_url" -}} {{- end -}} {{- if empty .Values.conf.senlin.senlin_api.bind_port -}} -{{- tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.senlin.senlin_api "bind_port" | quote | trunc 0 -}} +{{- $_ := tuple "clustering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.senlin.senlin_api "bind_port" -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.auth_url -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.senlin.authentication "auth_url" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.senlin.authentication "auth_url" -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.service_password -}} -{{- set .Values.conf.senlin.authentication "service_password" .Values.endpoints.identity.auth.senlin.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.authentication "service_password" .Values.endpoints.identity.auth.senlin.password -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.service_project_domain -}} -{{- set .Values.conf.senlin.authentication "service_project_domain" .Values.endpoints.identity.auth.senlin.project_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.authentication "service_project_domain" .Values.endpoints.identity.auth.senlin.project_domain_name -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.service_project_name -}} -{{- set .Values.conf.senlin.authentication "service_project_name" .Values.endpoints.identity.auth.senlin.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.authentication "service_project_name" .Values.endpoints.identity.auth.senlin.project_name -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.service_user_domain -}} -{{- set .Values.conf.senlin.authentication "service_user_domain" .Values.endpoints.identity.auth.senlin.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.authentication "service_user_domain" .Values.endpoints.identity.auth.senlin.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.senlin.authentication.service_username -}} -{{- set .Values.conf.senlin.authentication "service_username" .Values.endpoints.identity.auth.senlin.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.senlin.authentication "service_username" .Values.endpoints.identity.auth.senlin.username -}} {{- end -}} --- diff --git a/tempest/templates/configmap-etc.yaml b/tempest/templates/configmap-etc.yaml index 0982ea465a..bd44108b93 100644 --- a/tempest/templates/configmap-etc.yaml +++ b/tempest/templates/configmap-etc.yaml @@ -18,27 +18,27 @@ limitations under the License. {{- $envAll := . }} {{- if empty .Values.conf.tempest.auth.admin_username -}} -{{- set .Values.conf.tempest.auth "admin_username" .Values.endpoints.identity.auth.admin.username | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.auth "admin_username" .Values.endpoints.identity.auth.admin.username -}} {{- end -}} {{- if empty .Values.conf.tempest.auth.admin_password -}} -{{- set .Values.conf.tempest.auth "admin_password" .Values.endpoints.identity.auth.admin.password | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.auth "admin_password" .Values.endpoints.identity.auth.admin.password -}} {{- end -}} {{- if empty .Values.conf.tempest.auth.admin_project_name -}} -{{- set .Values.conf.tempest.auth "admin_project_name" .Values.endpoints.identity.auth.admin.project_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.auth "admin_project_name" .Values.endpoints.identity.auth.admin.project_name -}} {{- end -}} {{- if empty .Values.conf.tempest.auth.admin_domain_name -}} -{{- set .Values.conf.tempest.auth "admin_domain_name" .Values.endpoints.identity.auth.admin.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.auth "admin_domain_name" .Values.endpoints.identity.auth.admin.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.tempest.auth.admin_domain_scope -}} -{{- set .Values.conf.tempest.auth "admin_domain_scope" .Values.endpoints.identity.auth.admin.user_domain_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.auth "admin_domain_scope" .Values.endpoints.identity.auth.admin.user_domain_name -}} {{- end -}} {{- if empty .Values.conf.tempest.identity.uri_v3 -}} -{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.tempest.identity "uri_v3" | quote | trunc 0 -}} +{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.tempest.identity "uri_v3" -}} {{- end -}} {{- if empty .Values.conf.tempest.identity.region -}} -{{- set .Values.conf.tempest.identity "region" .Values.endpoints.identity.auth.admin.region_name | quote | trunc 0 -}} +{{- $_ := set .Values.conf.tempest.identity "region" .Values.endpoints.identity.auth.admin.region_name -}} {{- end -}} ---