openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[OVN] Remove check for OVN + Availability Zones"

This commit is contained in:
Zuul 2021-03-29 16:05:40 +00:00 committed by Gerrit Code Review
parent bcd4ddeb71 9283e44d16
commit 29f824b0b0
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,6 @@ conditions:
neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']} neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']}
is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]} is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]}
az_unset: {equals: [{get_param: NeutronDefaultAvailabilityZones}, '']} 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]} ovn_and_tls: {and: [is_ovn_in_neutron_mechanism_driver, internal_tls_enabled]}
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
key_size_override_unset: {equals: [{get_param: NeutronCertificateKeySize}, '']} key_size_override_unset: {equals: [{get_param: NeutronCertificateKeySize}, '']}
@ -375,7 +374,7 @@ outputs:
- neutron::server::ovs_integration_bridge: {get_param: NeutronOvsIntegrationBridge} - neutron::server::ovs_integration_bridge: {get_param: NeutronOvsIntegrationBridge}
- -
if: if:
- omit_az_configs - az_unset
- {} - {}
- -
neutron::server::dhcp_load_type: {get_param: NeutronDhcpLoadType} neutron::server::dhcp_load_type: {get_param: NeutronDhcpLoadType}

4
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -164,9 +164,7 @@ conditions:
service_wrapper_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]} service_wrapper_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']} service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']}
dhcp_ovs_intergation_bridge_unset: {equals: [{get_param: NeutronDhcpOvsIntegrationBridge}, '']} 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}, '']} 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}, '']} key_size_override_unset: {equals: [{get_param: NeutronDhcpCertificateKeySize}, '']}
resources: resources:
@ -258,7 +256,7 @@ outputs:
- {} - {}
- neutron::agents::dhcp::ovs_integration_bridge: {get_param: NeutronDhcpOvsIntegrationBridge} - neutron::agents::dhcp::ovs_integration_bridge: {get_param: NeutronDhcpOvsIntegrationBridge}
- if: - if:
- omit_az_configs - az_unset
- {} - {}
- neutron::agents::dhcp::availability_zone: {get_param: NeutronDhcpAgentAvailabilityZone} - neutron::agents::dhcp::availability_zone: {get_param: NeutronDhcpAgentAvailabilityZone}
service_config_settings: service_config_settings: