Merge pull request puppetlabs#356 from caseywilliams/MODULES-8317/upgrade-deps

(MODULES-8317) Update module dependencies

Author: branan

.fixtures.yml

@@ -2,15 +2,13 @@ fixtures:
   forge_modules:
     stdlib:
       repo: "puppetlabs/stdlib"
-      ref: "4.16.0"
-    transition:
-      repo: "puppetlabs/transition"
+      ref: "5.1.0"
     inifile:
       repo: "puppetlabs/inifile"
-      ref: "2.1.0"
+      ref: "2.4.0"
     apt:
       repo: "puppetlabs/apt"
-      ref: "4.4.0"
+      ref: "6.0.0"
     yumrepo_core:
       repo: "puppetlabs/yumrepo_core"
   symlinks:

manifests/install.pp

@@ -18,7 +18,6 @@
 ) {
   assert_private()
 
-  $old_packages = (versioncmp("${::clientversion}", '4.0.0') < 0)
   $pa_collection = getvar('::puppet_agent::collection')
 
   if ($::operatingsystem == 'SLES' and $::operatingsystemmajrelease == '10') or $::operatingsystem == 'AIX' {
@@ -27,63 +26,29 @@
       default => $install_options
     }
 
-    if $old_packages {
-      contain puppet_agent::install::remove_packages
-
-      exec { 'replace puppet.conf removed by package removal':
-        path      => '/bin:/usr/bin:/sbin:/usr/sbin',
-        command   => "cp ${puppet_agent::params::confdir}/puppet.conf.rpmsave ${puppet_agent::params::config}",
-        creates   => $puppet_agent::params::config,
-        require   => Class['puppet_agent::install::remove_packages'],
-        before    => Package[$puppet_agent::package_name],
-        logoutput => 'on_failure',
-      }
-
-      # package provider does not provide 'versionable'
-      $ensure = 'present'
-    } else {
-      $ensure = $package_version
-    }
 
     package { $::puppet_agent::package_name:
-      ensure          => $ensure,
+      ensure          => $package_version,
       provider        => 'rpm',
       source          => "/opt/puppetlabs/packages/${package_file_name}",
       install_options => $_install_options,
     }
   } elsif $::operatingsystem == 'Solaris' and $::operatingsystemmajrelease == '10' {
     $_unzipped_package_name = regsubst($package_file_name, '\.gz$', '')
+    $install_script = 'solaris_install.sh.erb'
+
+    # The following are expected to be available in the solaris_install.sh.erb template:
     $adminfile = '/opt/puppetlabs/packages/solaris-noask'
     $sourcefile = "/opt/puppetlabs/packages/${_unzipped_package_name}"
-    $install_script = 'solaris_install.sh.erb'
 
     # Puppet prior to 5.0 would not use a separate process contract when forking from the Puppet
     # service. That resulted in service-initiated upgrades failing because trying to remove or
     # upgrade the package would stop the service, thereby killing the Puppet run. Use a script
     # to perform the upgrade after Puppet is done running.
     # Puppet 5.0 adds this, but some i18n implementation is loading code fairly late and appears
     # to be messing up the upgrade.
-    if $old_packages or $puppet_agent::aio_upgrade_required {
-      $old_package_names = $old_packages ? {
-        true    => [
-          'PUPpuppet',
-          'PUPaugeas',
-          'PUPdeep-merge',
-          'PUPfacter',
-          'PUPhiera',
-          'PUPlibyaml',
-          'PUPmcollective',
-          'PUPopenssl',
-          'PUPpuppet-enterprise-release',
-          'PUPruby',
-          'PUPruby-augeas',
-          'PUPruby-rgen',
-          'PUPruby-shadow',
-          'PUPstomp',
-          ],
-          default => ['puppet-agent'],
-      }
 
+    if $puppet_agent::aio_upgrade_required {
       $_logfile = "${::env_temp_variable}/solaris_install.log"
       notice ("Puppet install log file at ${_logfile}")
 
@@ -97,52 +62,26 @@
         command => "/usr/bin/ctrun -l none ${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",
       }
     }
-  } elsif $::operatingsystem == 'Solaris' and $::operatingsystemmajrelease == '11' and $old_packages {
-    # Updating from PE 3.x requires removing all the old packages before installing the puppet-agent package.
-    # After puppet-agent is installed, we can use 'pkg update' for future upgrades.
-    contain puppet_agent::install::remove_packages
-
-    exec { 'puppet_agent restore /etc/puppetlabs':
-      command => 'cp -r /tmp/puppet_agent/puppetlabs /etc',
-      path    => '/bin:/usr/bin:/sbin:/usr/sbin',
-      require => Class['puppet_agent::install::remove_packages'],
-    }
-
-    package { $::puppet_agent::package_name:
-      ensure          => 'present',
-      require         => Exec['puppet_agent restore /etc/puppetlabs'],
-      notify          => Exec['puppet_agent post-install restore /etc/puppetlabs'],
-      install_options => $install_options,
-    }
-
-    exec { 'puppet_agent post-install restore /etc/puppetlabs':
-      command     => 'cp -r /tmp/puppet_agent/puppetlabs /etc',
-      path        => '/bin:/usr/bin:/sbin:/usr/sbin',
-      refreshonly => true,
-    }
   } elsif $::operatingsystem == 'Darwin' and $::macosx_productversion_major =~ /^10\.(9|10|11|12|13)/ {
-    if $old_packages or $puppet_agent::aio_upgrade_required {
+    if $puppet_agent::aio_upgrade_required {
       $install_script = 'osx_install.sh.erb'
 
-      contain puppet_agent::install::remove_packages
-
       $_logfile = "${::env_temp_variable}/osx_install.log"
       notice("Puppet install log file at ${_logfile}")
 
       $_installsh = "${::env_temp_variable}/osx_install.sh"
       file { "${_installsh}":
         ensure  => file,
         mode    => '0755',
-        content => template('puppet_agent/do_install.sh.erb'),
-        require => Class['Puppet_agent::Install::Remove_packages']
+        content => template('puppet_agent/do_install.sh.erb')
       }
       -> exec { 'osx_install script':
         command => "${_installsh} ${::puppet_agent_pid} 2>&1 > ${_logfile} &",
       }
     }
   } elsif $::osfamily == 'windows' {
     # Prevent re-running the batch install
-    if $old_packages or $puppet_agent::aio_upgrade_required {
+    if $puppet_agent::aio_upgrade_required {
       if $::puppet_agent::is_pe == true and empty($::puppet_agent::source) {
         $local_package_file_path = windows_native_path("${::puppet_agent::params::local_packages_dir}/${package_file_name}")
         class { 'puppet_agent::windows::install':

manifests/install/remove_packages.pp

@@ -131,9 +131,8 @@
     }
   ],
   "dependencies": [
-    {"name":"puppetlabs-stdlib","version_requirement":">= 4.16.0 < 5.0.0"},
-    {"name":"puppetlabs-transition","version_requirement":">= 0.1.1 < 0.2.0"},
-    {"name":"puppetlabs-inifile","version_requirement":">= 1.2.0 <= 2.1.0"},
-    {"name":"puppetlabs-apt","version_requirement":">= 4.4.0 < 5.0.0"}
+    {"name":"puppetlabs-stdlib","version_requirement":">= 5.1.0 < 6.0.0"},
+    {"name":"puppetlabs-inifile","version_requirement":">= 2.4.0 <= 3.0.0"},
+    {"name":"puppetlabs-apt","version_requirement":">= 6.0.0 < 7.0.0"}
   ]
 }