Merge pull request #200 from Dan33l/drop-bsd

drop EOL FreeBSD and OpenBSD
voxpupuli · Aug 7, 2019 · e1aff94 · e1aff94
2 parents 5aca00a + fec2a70
commit e1aff94
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 181 deletions.
diff --git a/README.md b/README.md
@@ -256,8 +256,6 @@ Net-SNMP module support is available with these operating systems:
 * RedHat family  - tested on CentOS 6, CentOS 7
 * SuSE family    - tested on SLES 11 SP1
 * Debian family  - tested on Debian 8, Debian 9, Ubuntu 14.04, Ubuntu 16.04, Ubuntu 18.04
-* FreeBSD family - tested on FreeBSD 9.2, FreeBSD 10.0
-* OpenBSD family - tested on OpenBSD 5.9
 
 ### Notes:
 

diff --git a/lib/facter/snmpv3_user.rb b/lib/facter/snmpv3_user.rb
@@ -1,16 +1,14 @@
 # snmpv3_user.rb --- Get SNMP usmUser data from configuration
 Facter.add(:snmpv3_user) do
   confine :os do |os|
-    %w[Debian FreeBSD OpenBSD RedHat Suse].include? os['family']
+    %w[Debian RedHat Suse].include? os['family']
   end
 
   setcode do
     fact = {}
 
     config = case Facter.value(:os)['family']
              when 'Debian'  then '/var/lib/snmp/snmpd.conf'
-             when 'FreeBSD' then '/var/net-snmp/snmpd.conf'
-             when 'OpenBSD' then '/var/net-snmp/snmpd.conf'
              when 'RedHat'  then '/var/lib/net-snmp/snmpd.conf'
              when 'Suse'    then '/var/lib/net-snmp/snmpd.conf'
              end

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -396,16 +396,6 @@
     require => Package['snmpd'],
   }
 
-  if $facts['os']['family'] == 'FreeBSD' {
-    file { $service_config_dir_path:
-      ensure  => 'directory',
-      owner   => $service_config_dir_owner,
-      group   => $service_config_dir_group,
-      mode    => $service_config_dir_perms,
-      require => Package['snmpd'],
-    }
-  }
-
   if $facts['os']['family'] == 'Suse' {
     file { '/etc/init.d/snmptrapd':
       source  => '/usr/share/doc/packages/net-snmp/rc.snmptrapd',
@@ -438,17 +428,15 @@
   }
 
 
-  unless $facts['os']['family'] == 'FreeBSD' or $facts['os']['family'] == 'OpenBSD' {
-    file { 'snmpd.sysconfig':
-      ensure  => $file_ensure,
-      path    => $sysconfig,
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      content => template($template_snmpd_sysconfig),
-      require => Package['snmpd'],
-      notify  => Service['snmpd'],
-    }
+  file { 'snmpd.sysconfig':
+    ensure  => $file_ensure,
+    path    => $sysconfig,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => template($template_snmpd_sysconfig),
+    require => Package['snmpd'],
+    notify  => Service['snmpd'],
   }
 
   if $facts['os']['family'] == 'RedHat' {

diff --git a/metadata.json b/metadata.json
@@ -40,19 +40,6 @@
         "7"
       ]
     },
-    {
-      "operatingsystem": "FreeBSD",
-      "operatingsystemrelease": [
-        "9.2",
-        "10.0"
-      ]
-    },
-    {
-      "operatingsystem": "OpenBSD",
-      "operatingsystemrelease": [
-        "5.9"
-      ]
-    },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [

diff --git a/spec/classes/snmp_client_spec.rb b/spec/classes/snmp_client_spec.rb
@@ -55,39 +55,6 @@
             require: nil
           )
         }
-      when 'FreeBSD'
-        it {
-          is_expected.to contain_package('snmp-client').with(
-            ensure: 'present',
-            name: 'net-mgmt/net-snmp'
-          )
-        }
-        it {
-          is_expected.not_to contain_file('snmp.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/usr/local/etc/snmp/snmp.conf'
-          )
-        }
-      when 'OpenBSD'
-        it {
-          is_expected.to contain_package('snmp-client').with(
-            ensure: 'present',
-            name: 'net-snmp'
-          )
-        }
-        it {
-          is_expected.not_to contain_file('snmp.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/etc/snmp/snmp.conf',
-            require: nil
-          )
-        }
       end
     end
 

diff --git a/spec/classes/snmp_init_spec.rb b/spec/classes/snmp_init_spec.rb
@@ -823,115 +823,6 @@
                             ])
           end
         end
-
-      when 'FreeBSD'
-        it {
-          is_expected.to contain_package('snmpd').with(
-            ensure: 'present',
-            name: 'net-mgmt/net-snmp'
-          )
-        }
-        it {
-          is_expected.to contain_file('var-net-snmp').with(
-            ensure: 'directory',
-            mode: '0600',
-            owner: 'root',
-            group: 'wheel',
-            path: '/var/net-snmp'
-          ).that_requires('Package[snmpd]')
-        }
-
-        it {
-          is_expected.to contain_file('snmpd.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/usr/local/etc/snmp/snmpd.conf'
-          ).that_requires('Package[snmpd]').that_notifies('Service[snmpd]')
-        }
-        it {
-          is_expected.to contain_service('snmpd').with(
-            ensure: 'running',
-            name: 'snmpd',
-            enable: true,
-            hasstatus: true,
-            hasrestart: true
-          ).that_requires(['Package[snmpd]', 'File[var-net-snmp]'])
-        }
-
-        it {
-          is_expected.to contain_file('snmptrapd.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/usr/local/etc/snmp/snmptrapd.conf'
-          ).that_requires('Package[snmpd]').that_notifies('Service[snmptrapd]')
-        }
-        it {
-          is_expected.to contain_service('snmptrapd').with(
-            ensure: 'stopped',
-            name: 'snmptrapd',
-            enable: false,
-            hasstatus: true,
-            hasrestart: true
-          ).that_requires(['Package[snmpd]', 'File[var-net-snmp]'])
-        }
-      when 'OpenBSD'
-        it {
-          is_expected.to contain_package('snmpd').with(
-            ensure: 'present',
-            name: 'net-snmp'
-          )
-        }
-        it {
-          is_expected.to contain_file('var-net-snmp').with(
-            ensure: 'directory',
-            mode: '0600',
-            owner: '_netsnmp',
-            group: 'wheel',
-            path: '/var/net-snmp'
-          ).that_requires('Package[snmpd]')
-        }
-
-        it {
-          is_expected.to contain_file('snmpd.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/etc/snmp/snmpd.conf'
-          ).that_requires('Package[snmpd]').that_notifies('Service[snmpd]')
-        }
-        it {
-          is_expected.to contain_service('snmpd').with(
-            ensure: 'running',
-            name: 'netsnmpd',
-            enable: true,
-            hasstatus: true,
-            hasrestart: true
-          ).that_requires(['Package[snmpd]', 'File[var-net-snmp]'])
-        }
-
-        it {
-          is_expected.to contain_file('snmptrapd.conf').with(
-            ensure: 'present',
-            mode: '0755',
-            owner: 'root',
-            group: 'wheel',
-            path: '/etc/snmp/snmptrapd.conf'
-          ).that_requires('Package[snmpd]').that_notifies('Service[snmptrapd]')
-        }
-        it {
-          is_expected.to contain_service('snmptrapd').with(
-            ensure: 'stopped',
-            name: 'netsnmptrapd',
-            enable: false,
-            hasstatus: true,
-            hasrestart: true
-          ).that_requires(['Package[snmpd]', 'File[var-net-snmp]'])
-        }
       else
         is_expected.to raise_error(Puppet::Error, %r{Module snmp is not supported on bar})
       end