Merge "Make NeutronEnableDVR parameter boolean"

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

@@ -97,8 +97,8 @@ parameters:
     hidden: true
   NeutronEnableDVR:
     description: Enable Neutron DVR.
-    default: ''
-    type: string
+    default: false
+    type: boolean
   NeutronEnableIgmpSnooping:
     description: Enable IGMP Snooping.
     type: boolean
@@ -242,8 +242,6 @@ conditions:
     not: {equals : [{get_param: NeutronRpcWorkers}, '']}
   neutron_ovs_int_br_set:
     not: {equals : [{get_param: NeutronOvsIntegrationBridge}, '']}
-  neutron_dvr_set:
-    not: {equals : [{get_param: NeutronEnableDVR}, '']}
   az_set:
     not: {equals: [{get_param: NeutronDefaultAvailabilityZones}, []]}
   ovn_and_tls:
@@ -423,10 +421,8 @@ outputs:
                   params:
                     $NETWORK: {get_param: [ServiceNetMap, NeutronApiNetwork]}
             tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA}
-          - if:
-            - neutron_dvr_set
-            - neutron::server::router_distributed: {get_param: NeutronEnableDVR}
-              neutron::server::enable_dvr: {get_param: NeutronEnableDVR}
+          - neutron::server::router_distributed: {get_param: NeutronEnableDVR}
+            neutron::server::enable_dvr: {get_param: NeutronEnableDVR}
           - if:
             - neutron_workers_set
             - neutron::server::api_workers: {get_param: NeutronWorkers}

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -76,9 +76,9 @@ parameters:
         Comma-separated list of extensions enabled for the Neutron agents.
     type: comma_delimited_list
   NeutronEnableDVR:
-    default: ''
+    default: false
     description: Enable Neutron DVR.
-    type: string
+    type: boolean
   NeutronEnableARPResponder:
     default: false
     description: |
@@ -154,8 +154,6 @@ parameters:
 conditions:
   firewall_driver_set:
     not: {equals : [{get_param: NeutronOVSFirewallDriver}, '']}
-  neutron_dvr_set:
-    not: {equals : [{get_param: NeutronEnableDVR}, '']}
   ethertypes_set:
     not: {equals : [{get_param: NeutronPermittedEthertypes}, []]}
   network_log_local_output_log_base_set:
@@ -255,10 +253,7 @@ outputs:
                    "%{lookup('$NETWORK')}"
                  params:
                    $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
-            neutron::agents::ml2::ovs::enable_distributed_routing:
-              if:
-                - neutron_dvr_set
-                - {get_param: NeutronEnableDVR}
+            neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR}
             neutron::agents::ml2::ovs::firewall_driver:
               if:
                 - firewall_driver_set

deployment/neutron/neutron-plugin-ml2-ovn.yaml

@@ -54,8 +54,8 @@ parameters:
     default: 38
   NeutronEnableDVR:
     description: Enable Neutron DVR.
-    default: ''
-    type: string
+    default: true
+    type: boolean
   NeutronEnableIgmpSnooping:
     description: Enable IGMP Snooping.
     type: boolean
@@ -110,8 +110,6 @@ parameters:
 
 
 conditions:
-  neutron_dvr_set:
-    not: {equals : [{get_param: NeutronEnableDVR}, '']}
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
   vhostuser_dir_set:
     or:
@@ -147,11 +145,7 @@ outputs:
             neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
             neutron::plugins::ml2::ovn::dns_servers: {get_param: OVNDnsServers}
             neutron::plugins::ml2::ovn::ovn_emit_need_to_frag: {get_param: OVNEmitNeedToFrag}
-            neutron::plugins::ml2::ovn::dvr_enabled:
-              if:
-                - neutron_dvr_set
-                - {get_param: NeutronEnableDVR}
-                - true
+            neutron::plugins::ml2::ovn::dvr_enabled: {get_param: NeutronEnableDVR}
           - if:
               - {get_param: EnableInternalTLS}
               - neutron::plugins::ml2::ovn::ovn_sb_ca_cert: {get_param: InternalTLSCAFile}

tools/yaml-validate.py

@@ -179,6 +179,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {
                        'description'],
     'NeutronBigswitchLLDPEnabled': ['default'],
     'NeutronWorkers': ['description'],
+    'NeutronEnableDVR': ['default'],
     'ServerMetadata': ['description'],
     'server': ['description'],
     'servers': ['description'],