Merge pull request #357 from bastelfreak/snmp

snmp: Only configure snmp_socket when it is required

Author: bastelfreak

spec/classes/keepalived_global_defs_spec.rb

@@ -12,6 +12,7 @@
 
       describe 'without parameters' do
         it { is_expected.to create_class('keepalived::global_defs') }
+        it { is_expected.to contain_concat__fragment('keepalived.conf_globaldefs').without('content' => %(snmp_socket)) }
       end
 
       describe 'with parameter notification_email as string' do
@@ -377,7 +378,8 @@
       describe 'with parameter snmp_socket' do
         let(:params) do
           {
-            snmp_socket: '/path'
+            snmp_socket: '/path',
+            enable_snmp_vrrp: true
           }
         end
 

templates/globaldefs.erb

@@ -123,7 +123,7 @@ global_defs {
   <%- if @dynamic_interfaces -%>
   dynamic_interfaces
   <%- end -%>
-  <%- if @snmp_socket -%>
+  <%- if @snmp_socket && (@enable_snmp_keepalived || @enable_snmp_vrrp || @enable_snmp_checker || @enable_snmp_rfc || @enable_snmp_rfcv2 || @enable_snmp_rfcv3) -%>
   snmp_socket <%= @snmp_socket %>
   <%- end -%>
   <%- if @vrrp_notify_fifo -%>