Merge "Use metadata_listen_port in nova config"

neutron/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.33
+version: 0.3.34
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:

neutron/templates/configmap-etc.yaml

@@ -120,18 +120,11 @@ limitations under the License.
 {{- $_ := tuple "load_balancer" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set $envAll.Values.conf.neutron.octavia "base_url" -}}
 {{- 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" -}}
-{{- 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" -}}
+{{- $_ := tuple "compute_metadata" "internal" . | 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 -}}
+{{- $_ := tuple "compute_metadata" "internal" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_port" }}
 {{- 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" -}}

neutron/values_overrides/tls.yaml

@@ -95,11 +95,13 @@ endpoints:
       api:
         public: 443
   compute_metadata:
+    hosts:
+      default: metadata
     scheme:
       default: https
     port:
       metadata:
-        public: 443
+        default: 443
   identity:
     auth:
       admin:

nova/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.3.36
+version: 0.3.37
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:

nova/templates/configmap-etc.yaml

@@ -151,8 +151,8 @@ limitations under the License.
 {{- $_ := set .Values.conf.nova.DEFAULT "metadata_host" .Values.endpoints.compute_metadata.ip.ingress -}}
 {{- end -}}
 
-{{- if empty .Values.conf.nova.DEFAULT.metadata_port -}}
+{{- if empty .Values.conf.nova.DEFAULT.metadata_listen_port -}}
-{{- $_ := tuple "compute_metadata" "public" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "metadata_port" -}}
+{{- $_ := tuple "compute_metadata" "internal" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.nova.DEFAULT "metadata_listen_port" -}}
 {{- end -}}
 
 {{- if empty .Values.conf.nova.placement.auth_url -}}

releasenotes/notes/neutron.yaml

@@ -75,4 +75,5 @@ neutron:
   - 0.3.31 FIX ovn-metadata-agent mountPropagation overrides by parent directory
   - 0.3.32 Update dpdk override
   - 0.3.33 Make sure trust on command is applied to avoid race-condition with ovs-dpdk
+  - 0.3.34 Update metadata endpoint
 ...

releasenotes/notes/nova.yaml

@@ -105,4 +105,5 @@ nova:
   - 0.3.34 Add public endpoints for the spiceproxy
   - 0.3.35 Use directory mount for vencrypt certificates
   - 0.3.36 Update Ceph images to Jammy and Reef 18.2.1
+  - 0.3.37 Use metadata_listen_port instead of metadata_port
 ...