Merge branch 'master' into feature/#18850_add_internal_virtual_ips

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-keepalived CHANGELOG
 ===============
 
+## 0.2.1
+
+  - nilsver
+    - [f0f1604] track sync interface fix
+
 ## 0.2.0
 
   - Miguel Negron

resources/libraries/helper.rb

@@ -1,4 +1,14 @@
 module Keepalived
   module Helper
+    require 'socket'
+
+    def interface_for_ip(ip_address)
+      return if ip_address.nil? || ip_address.empty?
+      interfaces = Socket.getifaddrs
+      interface = interfaces.find do |ifaddr|
+        ifaddr.addr.ipv4? && ifaddr.addr.ip_address == ip_address
+      end
+      interface.name
+    end
   end
 end

resources/metadata.rb

@@ -4,4 +4,4 @@
 maintainer_email 'dvanhoucke@redborder.com'
 license          'All rights reserved'
 description      'Installs/Configures cookbook-keepalived'
-version          '0.2.0'
+version          '0.2.1'

resources/providers/config.rb

@@ -4,6 +4,8 @@
 # Provider:: config
 #
 
+include Keepalived::Helper
+
 action :add do
   begin
     user = new_resource.user
@@ -101,7 +103,21 @@
       mode '0644'
       retries 2
       notifies :reload, 'service[keepalived]'
-      variables(vrrp_password: vrrp_secrets['pass'], managers: managers, start_id: vrrp_secrets['start_id'], balanced_services: balanced_services, virtual_ips: virtual_ips, virtual_ips_per_ip: virtual_ips_per_ip, has_any_virtual_ip: has_any_virtual_ip, manager_services: manager_services, ipmgt: ipmgt, iface: iface, ipsync: ipaddress_sync, managers_per_service: managers_per_service)
+      variables(
+        vrrp_password: vrrp_secrets['pass'],
+        managers: managers,
+        start_id: vrrp_secrets['start_id'],
+        balanced_services: balanced_services,
+        virtual_ips: virtual_ips,
+        virtual_ips_per_ip: virtual_ips_per_ip,
+        has_any_virtual_ip: has_any_virtual_ip,
+        manager_services: manager_services,
+        ipmgt: ipmgt,
+        iface: iface,
+        ipsync: ipaddress_sync,
+        managers_per_service: managers_per_service,
+        sync_iface_name: interface_for_ip(ipaddress_sync)
+      )
     end
 
     ips_added = {}

resources/templates/default/keepalived.conf.erb

@@ -95,6 +95,10 @@ vrrp_instance vi_<%= ip %> {
     virtual_ipaddress {
         <%= ip %>/32
     }
+    track_interface {
+      <%= @sync_iface_name %>
+    }
+
    <% webui_services = services.select{ |x| x['service']=='webui' } %>
    <% if webui_services.count > 0 && webui_services.first['ip'] == ip %>
      notify_master "/usr/lib/redborder/bin/rb_keepalived_master_notify_webui.sh"