Revert "Add additional support for Mac OS X"

Author: stephenrjohnson

manifests/agent.pp

@@ -6,8 +6,6 @@
 #   ['puppet_server']         - The dns name of the puppet master
 #   ['puppet_server_port']    - The Port the puppet master is running on
 #   ['puppet_agent_service']  - The service the puppet agent runs under
-#   ['mac_version']           - The package version for Mac OS X
-#   ['mac_facter_version']    - The Factor Version for Mac OS X
 #   ['puppet_agent_package']  - The name of the package providing the puppet agent
 #   ['version']               - The version of the puppet agent to install
 #   ['puppet_run_style']      - The run style of the agent either 'service', 'cron', 'external' or 'manual'
@@ -60,7 +58,6 @@
   $puppet_agent_service   = $::puppet::params::puppet_agent_service,
   $puppet_agent_package   = $::puppet::params::puppet_agent_package,
   $version                = 'present',
-  $puppet_facter_package  = $::puppet::params::puppet_facter_package,
   $puppet_run_style       = 'service',
   $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
   $user_id                = undef,
@@ -124,25 +121,9 @@
       gid    => $group_id,
     }
   }
-  case $::osfamily {
-    'Darwin': {
-      package {$puppet_facter_package:
-        ensure   => present,
-        provider => $package_provider,
-        source   => "https://downloads.puppetlabs.com/mac/${puppet_facter_package}",
-      }
-      package { $puppet_agent_package:
-        ensure   => present,
-        provider => $package_provider,
-        source   => "https://downloads.puppetlabs.com/mac/${puppet_agent_package}"
-      }
-    }
-    default: {
-      package { $puppet_agent_package:
-        ensure   => $version,
-        provider => $package_provider,
-      }
-    }
+  package { $puppet_agent_package:
+    ensure   => $version,
+    provider => $package_provider,
   }
 
   if $puppet_run_style == 'service' {
@@ -490,9 +471,9 @@
         }
         unless defined(Package['msgpack']) {
           package {'msgpack':
-            ensure   => 'latest',
-            provider => 'gem',
-            require  => Package[$::puppet::params::ruby_dev, 'gcc'],
+            ensure    => 'latest',
+            provider  => 'gem',
+            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
           }
         }
       }

manifests/params.pp

@@ -33,6 +33,7 @@
   $digest_algorithm                 = 'md5'
   $puppet_run_interval              = 30
   $classfile                        = '$statedir/classes.txt'
+  $package_provider                 = undef # falls back to system default
   $rundir                           = '/var/run/puppet'
   $puppet_passenger_ssl_protocol    = 'TLSv1.2'
   $puppet_passenger_ssl_cipher      = 'AES256+EECDH:AES256+EDH'
@@ -46,7 +47,6 @@
       $puppet_master_service        = 'puppetmaster'
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'puppet'
-      $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/sysconfig/puppet'
       $puppet_conf                  = '/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/lib/puppet'
@@ -60,7 +60,6 @@
       $puppet_master_service        = 'puppetmasterd'
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'puppet'
-      $package_provider                 = undef # falls back to system default
       $puppet_conf                  = '/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/lib/puppet'
       $puppet_ssldir                = '/var/lib/puppet/ssl'
@@ -72,7 +71,6 @@
       $puppet_master_service        = 'puppetmaster'
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'puppet'
-      $package_provider                 = undef # falls back to system default
       $puppet_defaults              = '/etc/default/puppet'
       $puppet_conf                  = '/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/lib/puppet'
@@ -84,16 +82,13 @@
     'FreeBSD': {
       $puppet_agent_service         = 'puppet'
       $puppet_agent_package         = 'sysutils/puppet'
-      $package_provider                 = undef # falls back to system default
       $puppet_conf                  = '/usr/local/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/puppet'
       $puppet_ssldir                = '/var/puppet/ssl'
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
-      $puppet_agent_package         = 'puppet-3.8.5.dmg'
-      $puppet_facter_package        = 'facter.2.4.5.dmg'
-      $package_provider             = 'pkgdmg'
+      $puppet_agent_package         = 'puppet'
       $puppet_conf                  = '/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/lib/puppet'
       $puppet_ssldir                = '/etc/puppet/ssl'