Merge "[OVN] Remove check for OVN + Availability Zones" into stable/train
This commit is contained in:
commit
f6549fefd4
|
@ -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}
|
||||
|
|
|
@ -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…
Reference in New Issue