Merge branch 'feature/ubuntu_support' into develop

README.md

@@ -23,7 +23,7 @@ OS Support:
 * RedHat family  - tested on CentOS 5.8 and CentOS 6.2
 * Fedora         - not yet supported
 * SuSE family    - presently unsupported (patches welcome)
-* Debian family  - presently unsupported (patches welcome)
+* Debian family  - initial Ubuntu suport (patches welcome)
 * Solaris family - presently unsupported (patches welcome)
 
 Class documentation is available via puppetdoc.

files/snmpd.sysconfig-Debian-12

@@ -0,0 +1,22 @@
+# This file controls the activity of snmpd and snmptrapd
+
+# Don't load any MIBs by default.
+# You might comment this lines once you have the MIBs downloaded.
+export MIBS=
+
+# snmpd control (yes means start daemon).
+SNMPDRUN=yes
+
+# snmpd options (use syslog, close stdin/out/err).
+SNMPDOPTS='-Lsd -Lf /dev/null -u snmp -g snmp -I -smux -p /var/run/snmpd.pid'
+
+# snmptrapd control (yes means start daemon).  As of net-snmp version
+# 5.0, master agentx support must be enabled in snmpd before snmptrapd
+# can be run.  See snmpd.conf(5) for how to do this.
+TRAPDRUN=no
+
+# snmptrapd options (use syslog).
+TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid'
+
+# create symlink on Debian legacy location to official RFC path
+SNMPDCOMPAT=yes

manifests/params.pp

@@ -59,6 +59,20 @@
     'Fedora': {
       fail("Module snmp is not yet supported on ${::operatingsystem}")
     }
+    'Ubuntu': {
+      $package_name        = 'snmpd'
+      $service_config      = '/etc/snmp/snmpd.conf'
+      $service_name        = 'snmpd'
+      $sysconfig           = '/etc/default/snmp'
+      $var_net_snmp        = '/var/lib/snmp'
+      $varnetsnmp_perms    = '0700'
+
+      $client_package_name = 'snmp'
+      $client_config       = '/etc/snmp/snmp.conf'
+
+      $trap_service_config = '/etc/snmp/snmptrapd.conf'
+      $trap_service_name   = 'snmptrapd'
+    }
     default: {
       fail("Module snmp is not supported on ${::operatingsystem}")
     }

manifests/trapd.pp

@@ -102,19 +102,21 @@
     notify  => Service['snmptrapd'],
   }
 
-  file { 'snmptrapd.sysconfig':
-    ensure  => $file_ensure,
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    path    => $snmp::params::trap_sysconfig,
-    source  => [
-      "puppet:///modules/snmp/snmptrapd.sysconfig-${::fqdn}",
-      "puppet:///modules/snmp/snmptrapd.sysconfig-${::osfamily}-${::lsbmajdistrelease}",
-      'puppet:///modules/snmp/snmptrapd.sysconfig',
-    ],
-    require => Package['snmpd'],
-    notify  => Service['snmptrapd'],
+  if $::osfamily != 'Debian' {
+    file { 'snmptrapd.sysconfig':
+      ensure  => $file_ensure,
+      mode    => '0644',
+      owner   => 'root',
+      group   => 'root',
+      path    => $snmp::params::trap_sysconfig,
+      source  => [
+        "puppet:///modules/snmp/snmptrapd.sysconfig-${::fqdn}",
+        "puppet:///modules/snmp/snmptrapd.sysconfig-${::osfamily}-${::lsbmajdistrelease}",
+        'puppet:///modules/snmp/snmptrapd.sysconfig',
+      ],
+      require => Package['snmpd'],
+      notify  => Service['snmptrapd'],
+    }
   }
 
   service { 'snmptrapd':

spec/classes/snmp_server_spec.rb

@@ -16,6 +16,7 @@
   end
 
   redhatish = ['RedHat']
+  debianish = ['Ubuntu']
 
   describe 'on a supported operatingsystem, with default settings' do
     redhatish.each do |os|
@@ -45,6 +46,29 @@
         )}
       end
     end
+
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {{}}
+        let :facts do {
+          :operatingsystem => os
+        }
+        end
+        it { should contain_file('snmpd.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmpd.conf'
+        )}
+        it { should contain_file('snmpd.sysconfig').with(
+          :ensure => 'present',
+          :path   => '/etc/default/snmp'
+        )}
+        it { should contain_service('snmpd').with(
+          :ensure => 'running',
+          :enable => true,
+          :name   => 'snmpd'
+        )}
+      end
+    end
   end
 
   describe 'on a supported operatingsystem, with custom settings' do
@@ -82,5 +106,34 @@
         )}
       end
     end
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {
+          {
+            :autoupgrade    => true,
+            :package_name   => 'snmp-server',
+            :service_ensure => 'stopped',
+            :service_enable => false
+          }
+        }
+        let :facts do {
+          :operatingsystem   => os
+        }
+        end
+        it { should contain_file('snmpd.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmpd.conf'
+        )}
+        it { should contain_file('snmpd.sysconfig').with(
+          :ensure => 'present',
+          :path   => '/etc/default/snmp'
+        )}
+        it { should contain_service('snmpd').with(
+          :ensure => 'stopped',
+          :enable => false,
+          :name   => 'snmpd'
+        )}
+      end
+    end
   end
 end

spec/classes/snmp_spec.rb

@@ -16,6 +16,7 @@
   end
 
   redhatish = ['RedHat']
+  debianish = ['Ubuntu']
 
   describe 'on a supported operatingsystem, with default settings' do
     redhatish.each do |os|
@@ -44,6 +45,31 @@
         )}
       end
     end
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {{}}
+        let :facts do {
+          :operatingsystem   => os
+        }
+        end
+        it { should contain_package('snmpd').with(
+          :ensure => 'present',
+          :name   => 'snmpd'
+        )}
+        it { should contain_package('snmp-client').with(
+          :ensure => 'present',
+          :name   => 'snmp'
+        )}
+        it { should contain_file('snmp.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmp.conf'
+        )}
+        it { should contain_file('var-net-snmp').with(
+          :ensure => 'directory',
+          :path   => '/var/lib/snmp'
+        )}
+      end
+    end
   end
 
   describe 'on a supported operatingsystem, with custom settings' do
@@ -78,5 +104,35 @@
         )}
       end
     end
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {
+          {
+            :ensure       => 'present',
+            :autoupgrade  => true,
+          }
+        }
+        let :facts do {
+          :operatingsystem   => os
+        }
+        end
+        it { should contain_package('snmpd').with(
+          :ensure => 'latest',
+          :name   => 'snmpd'
+        )}
+        it { should contain_package('snmp-client').with(
+          :ensure => 'latest',
+          :name   => 'snmp'
+        )}
+        it { should contain_file('snmp.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmp.conf'
+        )}
+        it { should contain_file('var-net-snmp').with(
+          :ensure => 'directory',
+          :path   => '/var/lib/snmp'
+        )}
+      end
+    end
   end
 end

spec/classes/snmp_trapd_spec.rb

@@ -16,6 +16,7 @@
   end
 
   redhatish = ['RedHat']
+  debianish = ['Ubuntu']
 
   describe 'on a supported operatingsystem, with default settings' do
     redhatish.each do |os|
@@ -41,6 +42,28 @@
         )}
       end
     end
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {{}}
+        let :facts do {
+          :operatingsystem   => os
+        }
+        end
+        it { should contain_file('snmptrapd.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmptrapd.conf'
+        )}
+#        it { should contain_file('snmptrapd.sysconfig').with(
+#          :ensure => 'present',
+#          :path   => '/etc/default/snmptrapd'
+#        )}
+        it { should contain_service('snmptrapd').with(
+          :ensure => 'running',
+          :enable => true,
+          :name   => 'snmptrapd'
+        )}
+      end
+    end
   end
 
   describe 'on a supported operatingsystem, with custom settings' do
@@ -73,6 +96,34 @@
         )}
       end
     end
+    debianish.each do |os|
+      describe "for operating system #{os}" do
+        let(:params) {
+          {
+            :service_name   => 'snmp-trapserver',
+            :service_ensure => 'stopped',
+            :service_enable => false
+          }
+        }
+        let :facts do {
+          :operatingsystem   => os
+        }
+        end
+        it { should contain_file('snmptrapd.conf').with(
+          :ensure => 'present',
+          :path   => '/etc/snmp/snmptrapd.conf'
+        )}
+#        it { should contain_file('snmptrapd.sysconfig').with(
+#          :ensure => 'present',
+#          :path   => '/etc/default/snmptrapd'
+#        )}
+        it { should contain_service('snmptrapd').with(
+          :ensure => 'stopped',
+          :enable => false,
+          :name   => 'snmp-trapserver'
+        )}
+      end
+    end
   end
 end