Merge "Add enable_default_router_(bfd|ecmp) option"

manifests/server.pp

@@ -230,6 +230,16 @@
 #   multicast packets only to ports connected to multicast routers.
 #   Defaults to $facts['os_service_default']
 #
+# [*enable_default_route_ecmp*]
+#   (Optional) Define the default value for enable_default_route_ecmp if not
+#   speficied on the router.
+#   Defaults to $facts['os_service_default']
+#
+# [*enable_default_route_bfd*]
+#   (Optional) Define the default value for enable_default_route_bfd if not
+#   speficied on the router.
+#   Defaults to $facts['os_service_default']
+#
 # DEPRECATED PARAMETERS
 #
 # [*ensure_vpnaas_package*]
@@ -280,6 +290,8 @@ class neutron::server (
   $igmp_flood                       = $facts['os_service_default'],
   $igmp_flood_reports               = $facts['os_service_default'],
   $igmp_flood_unregistered          = $facts['os_service_default'],
+  $enable_default_route_ecmp        = $facts['os_service_default'],
+  $enable_default_route_bfd         = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
   Boolean $ensure_vpnaas_package    = false,
 ) inherits neutron::params {
@@ -343,6 +355,8 @@ the neutron::services::vpnaas class.")
     'ovs/igmp_flood':                           value => $igmp_flood;
     'ovs/igmp_flood_reports':                   value => $igmp_flood_reports;
     'ovs/igmp_flood_unregistered':              value => $igmp_flood_unregistered;
+    'DEFAULT/enable_default_route_ecmp':        value => $enable_default_route_ecmp;
+    'DEFAULT/enable_default_route_bfd':         value => $enable_default_route_bfd;
   }
 
   if $server_package {

releasenotes/notes/enable-default-route-bfd-and-ecmp-7481396f3d10913d.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The following parameters have been added to the ``neutron::server`` class.
+
+    - ``enable_default_route_bfd``
+    - ``enable_default_route_ecmp``

spec/classes/neutron_server_spec.rb

@@ -93,6 +93,8 @@ describe 'neutron::server' do
       should contain_neutron_config('ovs/igmp_flood').with_value('<SERVICE DEFAULT>')
       should contain_neutron_config('ovs/igmp_flood_reports').with_value('<SERVICE DEFAULT>')
       should contain_neutron_config('ovs/igmp_flood_unregistered').with_value('<SERVICE DEFAULT>')
+      should contain_neutron_config('DEFAULT/enable_default_route_ecmp').with_value('<SERVICE DEFAULT>')
+      should contain_neutron_config('DEFAULT/enable_default_route_bfd').with_value('<SERVICE DEFAULT>')
     end
 
     context 'with manage_service as false' do
@@ -358,6 +360,20 @@ describe 'neutron::server' do
       end
     end
 
+    context 'with default route options' do
+      before :each do
+        params.merge!({
+          :enable_default_route_ecmp => false,
+          :enable_default_route_bfd  => false,
+        })
+      end
+
+      it 'configure neutron.conf' do
+        should contain_neutron_config('DEFAULT/enable_default_route_ecmp').with_value(false)
+        should contain_neutron_config('DEFAULT/enable_default_route_bfd').with_value(false)
+      end
+    end
+
     context 'with VPNaaS package installation' do
       before do
         params.merge!(