From 3248d79e6de6294605ec26c31d702f528627e5e0 Mon Sep 17 00:00:00 2001 From: Yatin Karel Date: Fri, 30 Jan 2026 19:42:46 +0530 Subject: [PATCH] [neutron-ovn] Add nova-metadata secret as optional OVN Agent also supports metadata extension, but without nova-metadata config it fails. Added nova-metadata-neutron-config secret to the neutron-ovn dataplane service as optional. Resolves: #OSPRH-25996 Signed-off-by: Yatin Karel --- ...openstackdataplaneservice_neutron_ovn.yaml | 3 ++ .../01-assert.yaml | 30 +++++++++++++++++++ .../01-assert.yaml | 30 +++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml index 827f89aaf..5b570a34b 100644 --- a/config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml @@ -7,6 +7,9 @@ spec: dataSources: - secretRef: name: neutron-ovn-agent-neutron-config + - secretRef: + name: nova-metadata-neutron-config + optional: true - configMapRef: name: neutron-ovn-extra-config optional: true diff --git a/test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml b/test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml index a4f302632..1a7a58a61 100644 --- a/test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml +++ b/test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml @@ -1137,6 +1137,15 @@ spec: - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf name: neutron-ovn-agent-neutron-config-0 subPath: 10-neutron-ovn.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/05-nova-metadata.conf + name: nova-metadata-neutron-config-0 + subPath: 05-nova-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/httpd.conf + name: nova-metadata-neutron-config-1 + subPath: httpd.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/nova-metadata-config.json + name: nova-metadata-neutron-config-2 + subPath: nova-metadata-config.json - mountPath: /var/lib/openstack/cacerts/neutron-ovn name: neutron-ovn-combined-ca-bundle - mountPath: /runner/env/ssh_key/ssh_key_edpm-compute-global @@ -1159,6 +1168,27 @@ spec: - key: 10-neutron-ovn.conf path: 10-neutron-ovn.conf secretName: neutron-ovn-agent-neutron-config + - name: nova-metadata-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 05-nova-metadata.conf + path: 05-nova-metadata.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-1 + secret: + defaultMode: 420 + items: + - key: httpd.conf + path: httpd.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-2 + secret: + defaultMode: 420 + items: + - key: nova-metadata-config.json + path: nova-metadata-config.json + secretName: nova-metadata-neutron-config - name: neutron-ovn-combined-ca-bundle secret: defaultMode: 420 diff --git a/test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml b/test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml index 3b7fafb8b..7825a52a4 100644 --- a/test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml +++ b/test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml @@ -1032,6 +1032,15 @@ spec: - mountPath: /var/lib/openstack/configs/neutron-ovn/10-neutron-ovn.conf name: neutron-ovn-agent-neutron-config-0 subPath: 10-neutron-ovn.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/05-nova-metadata.conf + name: nova-metadata-neutron-config-0 + subPath: 05-nova-metadata.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/httpd.conf + name: nova-metadata-neutron-config-1 + subPath: httpd.conf + - mountPath: /var/lib/openstack/configs/neutron-ovn/nova-metadata-config.json + name: nova-metadata-neutron-config-2 + subPath: nova-metadata-config.json - mountPath: /var/lib/openstack/cacerts/neutron-ovn name: neutron-ovn-combined-ca-bundle - mountPath: /runner/env/ssh_key/ssh_key_edpm-compute-no-nodes @@ -1054,6 +1063,27 @@ spec: - key: 10-neutron-ovn.conf path: 10-neutron-ovn.conf secretName: neutron-ovn-agent-neutron-config + - name: nova-metadata-neutron-config-0 + secret: + defaultMode: 420 + items: + - key: 05-nova-metadata.conf + path: 05-nova-metadata.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-1 + secret: + defaultMode: 420 + items: + - key: httpd.conf + path: httpd.conf + secretName: nova-metadata-neutron-config + - name: nova-metadata-neutron-config-2 + secret: + defaultMode: 420 + items: + - key: nova-metadata-config.json + path: nova-metadata-config.json + secretName: nova-metadata-neutron-config - name: neutron-ovn-combined-ca-bundle secret: defaultMode: 420