From 7203afb39e7a41731a359708c0fb5247cbf62471 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Fri, 26 Mar 2021 11:56:20 +0000 Subject: [PATCH] [OVN] Remove check for OVN + Availability Zones The ML2/OVN driver does support AZ-aware routing scheduling from stable/train and newer versions. This patch also removes the check from the DHCP agent container because although not a typical deployment, the Neutron DHCP agent can be deployed with OVN for special cases such as baremetal provisioning where the agent would serve DHCP to the baremetal instances. Change-Id: I8941c4d9a8e68eb775c910495de4aff9fbc67206 Signed-off-by: Lucas Alvares Gomes (cherry picked from commit 9283e44d16214f148e04a66d248514b170dad07f) --- deployment/neutron/neutron-api-container-puppet.yaml | 3 +-- deployment/neutron/neutron-dhcp-container-puppet.yaml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 04dc45c7de..2aec926e53 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -201,7 +201,6 @@ conditions: neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']} is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]} az_unset: {equals: [{get_param: NeutronDefaultAvailabilityZones}, '']} - omit_az_configs: {or: [is_ovn_in_neutron_mechanism_driver, az_unset]} ovn_and_tls: {and: [is_ovn_in_neutron_mechanism_driver, internal_tls_enabled]} key_size_override_unset: {equals: [{get_param: NeutronCertificateKeySize}, '']} @@ -363,7 +362,7 @@ outputs: - neutron::server::ovs_integration_bridge: {get_param: NeutronOvsIntegrationBridge} - if: - - omit_az_configs + - az_unset - {} - neutron::server::dhcp_load_type: {get_param: NeutronDhcpLoadType} diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 4d6aae466f..2e68ce58be 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -167,9 +167,7 @@ conditions: service_wrapper_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]} service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']} dhcp_ovs_intergation_bridge_unset: {equals: [{get_param: NeutronDhcpOvsIntegrationBridge}, '']} - is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]} az_unset: {equals: [{get_param: NeutronDhcpAgentAvailabilityZone}, '']} - omit_az_configs: {or: [is_ovn_in_neutron_mechanism_driver, az_unset]} key_size_override_unset: {equals: [{get_param: NeutronDhcpCertificateKeySize}, '']} resources: @@ -282,7 +280,7 @@ outputs: - {} - neutron::agents::dhcp::ovs_integration_bridge: {get_param: NeutronDhcpOvsIntegrationBridge} - if: - - omit_az_configs + - az_unset - {} - neutron::agents::dhcp::availability_zone: {get_param: NeutronDhcpAgentAvailabilityZone} service_config_settings: