Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 2, 2026
+63 −0
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_ovn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 30 additions & 0 deletions test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
30 changes: 30 additions & 0 deletions test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down