From ba393720beb89ddce2b9b17ff75ac71aa64ac93e Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 7 Jul 2021 17:51:13 +0200 Subject: [PATCH] Make default of NeutronDefaultAvailabilityZones empty array NeutronDefaultAvailabilityZones is of type comma_delimited_list therefore the default need to be [] instead of ''. Right now the condition checks for empty string which is not the case for comma_delimited_list and the hieradata covered by the az_unset condition get always set. Closes-Bug: #1934970 Change-Id: I0e1f7eed0ffe751fa54682103051ad29c08c1517 (cherry picked from commit f276e7a4ae39c484226c2ebe6053e7a53a6fcaa1) (cherry picked from commit be2c8e62cecff253eb86a213c778943ee5b22346) --- deployment/neutron/neutron-api-container-puppet.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 0b52a808ba..9e9bbb7765 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -144,7 +144,7 @@ parameters: be used by Neutron if its resource is created without availability zone hints. If not set, no AZs will be configured for Neutron network services. - default: '' + default: [] type: comma_delimited_list NeutronNetworkSchedulerDriver: description: The network schedule driver to use for avialability zones. @@ -204,7 +204,7 @@ conditions: internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} neutron_dvr_unset: {equals : [{get_param: NeutronEnableDVR}, '']} is_ovn_in_neutron_mechanism_driver: {contains: ['ovn', {get_param: NeutronMechanismDrivers}]} - az_unset: {equals: [{get_param: NeutronDefaultAvailabilityZones}, '']} + az_unset: {equals: [{get_param: NeutronDefaultAvailabilityZones}, []]} 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}, '']}