.fixtures.yml

@@ -2,14 +2,14 @@ fixtures:
   forge_modules:
     stdlib:
       repo: "puppetlabs/stdlib"
-      ref: "4.12.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: "2.3.0"
+      ref: "6.0.0"
+    yumrepo_core:
+      repo: "puppetlabs/yumrepo_core"
   symlinks:
     puppet_agent: "#{source_dir}"

.gitignore

@@ -18,6 +18,8 @@ log/
 pkg/
 spec/fixtures/manifests/
 spec/fixtures/modules/
+task_spec/spec/fixtures/manifests/
+task_spec/spec/fixtures/modules/
 tmp/
 vendor/
 

.sync.yml

@@ -55,7 +55,6 @@
             - 'x64_mingw'
         - gem: 'puppet-module-posix-dev-r#{minor_version}'
           platforms: 'ruby'
-          version: '0.3.3'
         - gem: 'puppet-module-win-dev-r#{minor_version}'
           platforms:
             - 'mswin'
@@ -72,9 +71,6 @@
           condition: "Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')"
         - gem: fast_gettext
           condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')"
-        # Pin rspec-puppet 2.6.9 until https://github.com/rodjek/rspec-puppet/issues/663 is fixed
-        - gem: 'rspec-puppet'
-          version: '2.6.9'
 
   appveyor.yml:
     unmanaged: true

.travis.yml

@@ -16,17 +16,26 @@ before_install:
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.4.1
-    env: CHECK="validate lint"
-  - rvm: 2.1.0
-    env: PUPPET_GEM_VERSION="~> 3.8" FUTURE_PARSER="yes" CHECK=spec BEAKER_VERSION="3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 4.0.0" CHECK=spec BEAKER_VERSION="3.0"
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="4.7.1" HIERA_GEM_VERSION="3.2.2" CHECK=spec
-  - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.10" CHECK=spec
-  - rvm: 2.4.1
+  - rvm: 2.5.3
+    env: CHECK="validate lint spec"
+  - rvm: 2.5.3
     env: PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
+  - rvm: 2.3.8
+    env: PUPPET_GEM_VERSION="~> 4.10" CHECK=spec
+  # These cells test the task on different platforms
+  - rvm: 2.3.8
+    dist: trusty
+    env: GEM_BOLT=true BEAKER_debug=true BEAKER_set=docker/ubuntu-18.04
+    install: bundle install
+    script: cd task_spec && bundle exec rake task_acceptance
+    services: docker
+    sudo: required
+  - rvm: 2.3.8
+    dist: trusty
+    env: GEM_BOLT=true BEAKER_debug=true BEAKER_set=docker/centos-7
+    install: bundle install
+    script: cd task_spec && bundle exec rake task_acceptance
+    services: docker
+    sudo: required
 notifications:
   email: false

Gemfile

@@ -42,25 +42,33 @@ minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
 #end
 
 group :development do
-  gem "puppet-module-posix-default-r#{minor_version}",      :require => false, :platforms => "ruby"
-  gem "puppet-module-win-default-r#{minor_version}",        :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "puppet-module-posix-dev-r#{minor_version}", '0.3.3', :require => false, :platforms => "ruby"
-  gem "puppet-module-win-dev-r#{minor_version}", '0.0.7',   :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "json_pure", '<= 2.0.1',                              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "fast_gettext", '1.1.0',                              :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                       :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "rspec-puppet", "2.6.9",                              :require => false
+  gem "puppet-module-posix-default-r#{minor_version}",       :require => false, :platforms => "ruby"
+  gem "puppet-module-win-default-r#{minor_version}",         :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', :require => false, :platforms => "ruby"
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.0.7', :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
+  gem "json_pure", '<= 2.0.1',                               :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "fast_gettext", '1.1.0',                               :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
+  gem "fast_gettext",                                        :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
 end
 
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            :require => false, :platforms => "ruby"
   gem "puppet-module-win-system-r#{minor_version}",                              :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.37')
+  gem "beaker-docker", '~> 0.3'
+  gem "beaker-vagrant", '~> 0.5'
+  gem "beaker-vmpooler", '~> 1.3'
+  gem "serverspec", '~> 2.39'
   gem "beaker-pe",                                                               :require => false
-  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
+  gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 6.2')
   gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
   gem "puppet-blacksmith", '~> 3.4',                                             :require => false
+  # Bundler fails on 2.1.9 even though this group is excluded
+  if ENV['GEM_BOLT']
+    gem 'bolt', '~> 1.9', require: false
+    gem 'beaker-task_helper', '~> 1.5.2', require: false
+  end
 end
 
 gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

README.markdown

@@ -11,17 +11,20 @@
     * [Setup requirements](#setup-requirements)
     * [Beginning with puppet_agent](#beginning-with-puppet_agent)
 4. [Usage - Configuration options and additional functionality](#usage)
+    * [Puppet 3 Upgrades](#puppet-3-upgrades)
+    * [Puppet 4 Upgrades](#puppet-4-upgrades)
 5. [Reference](#reference)
     * [Public classes](#public-classes)
     * [Private classes](#private-classes)
     * [Parameters](#parameters)
+    * [Tasks](#tasks)
 6. [Limitations - OS compatibility, etc.](#limitations)
     * [Known issues](#known-issues)
 7. [Development - Guide for contributing to the module](#development)
 
 ## Overview
 
-A module for upgrading Puppet agents. Supports upgrading from Puppet 3 packages and puppet-agent packages, to puppet-agent packages (i.e. Puppet 4).
+A module for upgrading Puppet agents. Supports upgrading from Puppet 4 puppet-agent packages to later versions.
 
 ## Module Description
 
@@ -31,8 +34,6 @@ If a package_version parameter is provided, it will ensure that puppet-agent ver
 
 This module expects Puppet to be installed from packages.
 
-Note: this is the last release that will support Puppet 3 and Ruby <2.1.
-
 ## Setup
 
 ### What puppet_agent affects
@@ -197,6 +198,20 @@ This is only applicable for Windows operating systems. There may be instances wh
   msi_move_locked_files => true
 ```
 
+### Tasks
+
+#### `puppet_agent::version`
+
+Checks for the version of puppet-agent package installed. Returns results as `{"version": "<ver>", "source": "<how version was
+detected>"}`. If a version cannot be found, returns `{"version": null}`.
+
+#### `puppet_agent::install`
+
+Installs the puppet-agent package. Currently only supports Linux variants: Debian, Ubuntu, SLES, RHEL/CentOS/Fedora. A specific
+package `version` can be specified; if not, will install or upgrade to the latest Puppet 5 version available.
+
+**Note**: The `puppet_agent::install_shell` task requires the `facts::bash` implementation from the [facts](https://forge.puppet.com/puppetlabs/facts) module. Both the `puppet_agent` and `facts` modules are packaged with Bolt. For use outside of Bolt make sure the `facts` module is installed to the same `modules` directory as `puppet_agent`.
+
 ## Limitations
 
 Mac OS X Open Source packages are currently not supported.

files/solaris_start_puppet.sh

@@ -1,14 +1,13 @@
 #!/bin/bash
 
 puppet_pid=$1
+shift
+service_names=$*
+
 while $(kill -0 ${puppet_pid:?}); do
   sleep 5
 done
 
-function start_service() {
-  service="${1:?}"
-  /opt/puppetlabs/bin/puppet resource service "${service:?}" ensure=running enable=true
-}
-
-start_service puppet
-start_service mcollective
+for service_name in $service_names; do
+  /opt/puppetlabs/bin/puppet resource service "${service_name:?}" ensure=running enable=true
+done

lib/puppet/parser/functions/windows_msi_installargs.rb

@@ -0,0 +1,19 @@
+module Puppet::Parser::Functions
+  newfunction(:windows_msi_installargs, :arity => 1, :type => :rvalue, :doc => <<-EOS
+  Return the $install_options parameter as a string usable in an msiexec command
+  EOS
+  ) do |args|
+
+    install_args = args[0]
+
+    arg_string = install_args.map do |option|
+      if option.class == Hash
+        key_value = option.shift
+        "#{key_value[0]}=\"#{key_value[1]}\""
+      else
+        option
+      end
+    end
+    return arg_string.join(' ')
+  end
+end

manifests/init.pp

@@ -69,8 +69,6 @@
   $msi_move_locked_files = false,
 ) inherits ::puppet_agent::params {
 
-  validate_re($arch, ['^x86$','^x64$','^i386$','^i86pc$','^amd64$','^x86_64$','^power$','^sun4[uv]$', '^ppc64le$', '^aarch64$', 'PowerPC_POWER'])
-
   if $::osfamily == 'windows' and $install_dir != undef {
     validate_absolute_path($install_dir)
   }
@@ -93,9 +91,10 @@
       $_expected_package_version = $package_version
     }
 
-    $aio_upgrade_required = ($is_pe == false and $_expected_package_version != undef) or
-      (getvar('::aio_agent_version') != undef and $_expected_package_version != undef and
-        versioncmp("${::aio_agent_version}", "${_expected_package_version}") < 0)
+    $aio_upgrade_required = (getvar('::aio_agent_version') == undef) or
+      (getvar('::aio_agent_version') != undef and
+      $_expected_package_version != undef and
+      versioncmp("${::aio_agent_version}", "${_expected_package_version}") < 0)
 
     if $::architecture == 'x86' and $arch == 'x64' {
       fail('Unable to install x64 on a x86 system')
@@ -173,14 +172,16 @@
     contain '::puppet_agent::prepare'
     contain '::puppet_agent::install'
 
-    # On windows, our MSI handles the services
-    # On PE AIO nodes, PE Agent nodegroup is managing the services
+    # Service management:
+    # - Under Puppet Enterprise, the agent nodegroup is managed by PE, and we don't need to manage services here.
+    # - On Windows, services are handled by the puppet-agent MSI packages themselves.
+    # ...but outside of PE, on other platforms, we must make sure the services are restarted. We do that with the
+    # ::puppet_agent::service class. Make sure it's applied after the install process finishes if needed:
     if $::osfamily != 'windows' and (!$is_pe or versioncmp($::clientversion, '4.0.0') < 0) {
       class { '::puppet_agent::service':
         require => Class['::puppet_agent::install'],
       }
       contain '::puppet_agent::service'
     }
-
   }
 }