Merge branch 'development'

redBorder · Oct 14, 2024 · f32e250 · f32e250
2 parents ca1df07 + 34d366f
commit f32e250
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 cookbook-keepalived CHANGELOG
 ===============
 
+## 0.2.0
+
+  - Miguel Negron
+    - [9c39609] notify webui only for webui service
+
 ## 0.1.1
 
   - Miguel Negrón

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -4,4 +4,4 @@
 maintainer_email 'dvanhoucke@redborder.com'
 license          'All rights reserved'
 description      'Installs/Configures cookbook-keepalived'
-version          '0.1.1'
+version          '0.2.0'
diff --git a/resources/templates/default/keepalived.conf.erb b/resources/templates/default/keepalived.conf.erb
@@ -91,7 +91,8 @@ vrrp_instance vi_<%= ip %> {
     virtual_ipaddress {
         <%= ip %>/32
     }
-   <% if services.select{ |x| x["service"]=="webui" } %>
+   <% 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"
      notify_backup "/usr/lib/redborder/bin/rb_keepalived_backup_notify_webui.sh"
    <% end %>
@@ -209,4 +210,4 @@ virtual_server <%= external_vip[balance["service"]]["ip"] %> <%= balance[:port]
 }
 <% end %>
 <% end %>
-<% end %>
+<% end %>