From 594b4289297fc67a2201d645c8d3a9e148f44a6f Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Mon, 8 Jan 2018 14:44:41 -0500 Subject: [PATCH] Start using nova_metadata_host nova_metadata_ip was deprecated in Pike and is being removed in Queens, update its usage. Change-Id: I347720dc8c90f78dbaef7565c091d1367a29d7c4 --- neutron/templates/configmap-etc.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index 1d7fe0c8ca..d644c64f31 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -82,8 +82,17 @@ limitations under the License. {{- set $envAll.Values.conf.neutron.nova "password" $envAll.Values.endpoints.identity.auth.nova.password | quote | trunc 0 -}} {{- end -}} +{{/* +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 -}} +{{- 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 -}} +{{- 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 -}} {{- end -}} {{- if empty $envAll.Values.conf.metadata_agent.cache.memcache_servers -}}