Merge pull request #199 from derJD/master

add support for virtual_rules

README.md

@@ -91,8 +91,9 @@ node /node01/ {
     auth_type         => 'PASS',
     auth_pass         => 'secret',
     virtual_ipaddress => [ '10.0.0.1/29' ],
-    virtual_routes    => [ { to  => '168.168.2.0/24', via => '10.0.0.2' },
-                           { to  => '168.168.3.0/24', via => '10.0.0.3' } ]
+    virtual_routes    => [ { to   => '168.168.2.0/24', via => '10.0.0.2' },
+                           { to   => '168.168.3.0/24', via => '10.0.0.3' } ],
+    virtual_rules     => [ { from => '168.168.2.42', lookup => 'customroute' } ]
   }
 }
 ```
@@ -115,6 +116,9 @@ keepalived::vrrp_instance:
         via: '10.0.0.2'
       - to: 168.168.3.0/24'
         via: '10.0.0.3'
+    virtual_rules:
+      - from: '168.168.2.42'
+        lookup: 'customroute'
 ```
 
 ### Detect application level failure

manifests/vrrp/instance.pp

@@ -32,6 +32,16 @@
 #                                     'metric' => '15' }`
 #                             Supported properties: src, to, via, dev, scope, table, metric
 #
+# $virtual_rules::        Set floating rules.
+#
+#                          May be specified as a hash (or array of hashes)
+#                             containing extra properties
+#                             e.g. `{ 'from' => '10.0.0.1',
+#                                     'via' => '10.0.0.254',
+#                                     'lookup' => 'customroute',
+#                                     'metric' => '15' }`
+#                             Supported properties: from, to, dev, lookup, metric
+#
 # $virtual_ipaddress_excluded:: For cases with large numbers (eg 200) of IPs
 #                               on the same interface. To decrease the number
 #                               of packets sent in adverts, you can exclude
@@ -167,6 +177,7 @@
   $virtual_ipaddress_int                                            = undef,
   $virtual_ipaddress_excluded                                       = undef,
   $virtual_routes                                                   = undef,
+  Optional[Array[Keepalived::Vrrp::Instance::VRule]] $virtual_rules = undef,
   $smtp_alert                                                       = false,
   $nopreempt                                                        = false,
   $preempt_delay                                                    = undef,

spec/defines/keepalived_vrrp_instance_spec.rb

@@ -798,6 +798,27 @@
         }
       end
 
+      describe 'with virtual_rules as array of hashes' do
+        let(:params) do
+          mandatory_params.merge(
+            virtual_rules: [{ 'from' => '10.0.1.24', 'lookup' => 'customroute1' },
+                            { 'from' => '10.0.2.24', 'lookup' => 'customroute2' }]
+          )
+        end
+
+        it { is_expected.to create_keepalived__vrrp__instance('_NAME_') }
+        it {
+          is_expected.to \
+            contain_concat__fragment('keepalived.conf_vrrp_instance__NAME_').with(
+              'content' => %r{^\s+from 10\.0\.1\.24 lookup customroute1}
+            )
+          is_expected.to \
+            contain_concat__fragment('keepalived.conf_vrrp_instance__NAME_').with(
+              'content' => %r{^\s+from 10\.0\.2\.24 lookup customroute2}
+            )
+        }
+      end
+
       # device in hash overrides anything
       describe 'with virtual_routes as hash containing device parameter' do
         let(:params) do

templates/vrrp_instance.erb

@@ -184,6 +184,14 @@ vrrp_instance <%= @_name %> {
   }
   <%- end -%>
 
+  <%- if @virtual_rules -%>
+  virtual_rules {
+  <%-  @virtual_rules.each do |rule| -%>
+    <%= rule['rule'] %>  <%= rule.sort_by{ |k,v| k }.entries.join ' ' %>
+  <%- end -%>
+  }
+  <%- end -%>
+
   <%- if @multicast_source_ip -%>
   mcast_src_ip <%= @multicast_source_ip %>
   <%- end -%>

types/vrrp/instance/vrule.pp

@@ -0,0 +1,6 @@
+type Keepalived::Vrrp::Instance::VRule = Struct[
+  Optional[from]   => String,
+  Optional[to]     => String,
+  Optional[dev]    => String,
+  Optional[lookup] => String
+]