Skip to content

dataplane: default to neutron-ovn instead of neutron-metadata #2129

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

Open
karelyatin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dataplane: default to neutron-ovn instead of neutron-metadata #2129

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
2 changes: 1 addition & 1 deletion api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
2 changes: 1 addition & 1 deletion api/dataplane/v1beta1/openstackdataplanenodeset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type OpenStackDataPlaneNodeSetSpec struct {
NetworkAttachments []string `json:"networkAttachments,omitempty"`

// +kubebuilder:validation:Optional
// +kubebuilder:default={redhat,download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry}
// +kubebuilder:default={redhat,download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-ovn,libvirt,nova,telemetry}
// Services list
Services []string `json:"services"`

Expand Down
2 changes: 1 addition & 1 deletion bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22351,7 +22351,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
2 changes: 1 addition & 1 deletion config/samples/dataplane/bgp/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ data:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- ovn-bgp-agent
- libvirt
- nova
Expand Down
2 changes: 1 addition & 1 deletion config/samples/dataplane/bgp_ovn_cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ data:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- ovn-bgp-agent
- libvirt
- nova
Expand Down
2 changes: 1 addition & 1 deletion config/samples/dataplane/ceph/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data:
- ceph-client
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova-custom-ceph
nodetemplate:
Expand Down
1 change: 0 additions & 1 deletion config/samples/dataplane/ovs_dpdk/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ data:
- install-certs
- ovn
- neutron-ovn
- neutron-metadata
- libvirt
- nova
- telemetry
2 changes: 1 addition & 1 deletion config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -11,7 +11,6 @@ spec:
name: neutron-ovn-agent-neutron-config
- secretRef:
name: nova-metadata-neutron-config
optional: true
- configMapRef:
name: neutron-ovn-extra-config
optional: true
Expand Down
9 changes: 6 additions & 3 deletions docs/assemblies/con_data-plane-services.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,17 @@ services:
- libvirt
- nova
- ovn
- neutron-metadata
- neutron-ovn
- telemetry
----

If the `services` field is omitted from the `OpenStackDataPlaneNodeSet` spec,
then the above list will be used.

The `neutron-ovn` service runs the Neutron OVN agent on the data plane nodes,
with its `metadata` extension enabled by default, providing metadata services
to the Compute nodes.

The associated `OpenStackDataPlaneService` resources are reconciled during
`OpenStackDataPlaneNodeSet` reconciliation if the service is in the NodeSets'
service list.
Expand Down Expand Up @@ -80,8 +84,7 @@ spec:
|`ceph-hci-pre` |Include this service to prepare data plane nodes to host Red Hat Ceph Storage in an HCI configuration. For more information, see xref:assembly_configuring-a-hyperconverged-infrastructure-environment[Configuring a Hyperconverged Infrastructure environment].
|`configure-ovs-dpdk` |Include this service to configure OvS DPDK configuration on EDPM nodes. This service is needed to enable OvS DPDK on the compute nodes.
|`neutron-sriov` |Include this service to run a Neutron SR-IOV NIC agent on the data plane nodes.
|`neutron-metadata` |Include this service to run the Neutron OVN Metadata agent on the data plane nodes. This agent is required to provide metadata services to the Compute nodes.
|`neutron-ovn` |Include this service to run the Neutron OVN agent on the data plane nodes. This agent is required to provide QoS to hardware offloaded ports on the Compute nodes.
|`neutron-metadata` |(Deprecated) Include this service to run the standalone Neutron OVN Metadata agent on the data plane nodes. Superseded by the `metadata` extension of the `neutron-ovn` service, which is enabled by default.
|`neutron-dhcp` |Include this service to run a Neutron DHCP agent on the data plane nodes.
|`cleanup` |Include this service to clean up containers and configurations for services that have been removed from the nodeset. The cleanup service compares the current services list with previously deployed services, removes containers for services no longer in the list, removes startup_config and configuration files, and runs service-specific cleanup tasks. Use this service via `servicesOverride` for one-time cleanup after removing services from a nodeset, or add to the services list if cleanup should run on every deployment.
|===
Expand Down
2 changes: 1 addition & 1 deletion docs/assemblies/proc_creating-a-custom-service.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ service to execute for the `edpm-compute` `NodeSet`.
- configure-os
- run-os
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
nodes:
Expand Down
2 changes: 1 addition & 1 deletion docs/assemblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-bare-metal-nodes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
2 changes: 1 addition & 1 deletion ...semblies/ref_example-OpenStackDataPlaneNodeSet-CR-for-preprovisioned-nodes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
- reboot-os
- install-certs
- ovn
- neutron-metadata
- neutron-ovn
- libvirt
- nova
- telemetry
Expand Down
8 changes: 4 additions & 4 deletions test/functional/dataplane/openstackdataplanenodeset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
"reboot-os",
"install-certs",
"ovn",
"neutron-metadata",
"neutron-ovn",
"libvirt",
"nova",
"telemetry"}
Expand Down Expand Up @@ -387,7 +387,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
"reboot-os",
"install-certs",
"ovn",
"neutron-metadata",
"neutron-ovn",
"libvirt",
"nova",
"telemetry",
Expand Down Expand Up @@ -442,7 +442,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
"reboot-os",
"install-certs",
"ovn",
"neutron-metadata",
"neutron-ovn",
"libvirt",
"nova",
"telemetry",
Expand Down Expand Up @@ -870,7 +870,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
"reboot-os",
"install-certs",
"ovn",
"neutron-metadata",
"neutron-ovn",
"libvirt",
"nova",
"telemetry"}
Expand Down
Loading