Browse Source

Merge "[OVN] Remove check for OVN + Availability Zones" into stable/ussuri

changes/99/786699/1
Zuul 8 months ago
committed by Gerrit Code Review
parent
commit
cbb986d82f
  1. 3
      deployment/neutron/neutron-api-container-puppet.yaml
  2. 4
      deployment/neutron/neutron-dhcp-container-puppet.yaml

3
deployment/neutron/neutron-api-container-puppet.yaml

@ -205,7 +205,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]}
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
key_size_override_unset: {equals: [{get_param: NeutronCertificateKeySize}, '']}
@ -381,7 +380,7 @@ outputs:
- neutron::server::ovs_integration_bridge: {get_param: NeutronOvsIntegrationBridge}
-
if:
- omit_az_configs
- az_unset
- {}
-
neutron::server::dhcp_load_type: {get_param: NeutronDhcpLoadType}

4
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:

Loading…
Cancel
Save