Merge pull request #1787 from karelyatin/OSPRH-25996

[neutron-ovn] Add nova-metadata secret as optional

Author: openshift-merge-bot[bot]

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

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

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