CHANGELOG.md

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.0] - 2020-05-13
+
+### Summary
+Install task can download Ubuntu 20.04. Fixed mcollective being included as a default service.
+
+### Features
+- Allow install task to download puppet-agent for Ubuntu 20.04 ([#491](https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/491))
+
+### Bug fixes
+- Fix mcollective being included as a default service to manage in client version >= 6.0.0 ([#485](https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/485))
+
 ## [3.1.0] - 2020-04-02
 
 ### Summary

README.markdown

@@ -318,7 +318,7 @@ The `puppet_agent::version` task returns a Result on success specifying the vers
 
 #### `puppet_agent::install`
 
-Installs the puppet-agent package.
+Installs the puppet-agent package.  This task should not be used for upgrading agents particularly windows agents which have requirements other than just installing the puppet-agent msi.    
 
 > **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`.
 

manifests/service.pp

@@ -7,7 +7,7 @@
   assert_private()
 
   # Starting with puppet6 collections we no longer carry the mcollective service
-  if $::puppet_agent::collection != 'PC1' and $::puppet_agent::collection != 'puppet5' {
+  if versioncmp("${::clientversion}", '6.0.0') >= 0 {
     $_service_names = delete($::puppet_agent::service_names, 'mcollective')
   } else {
     $_service_names = $::puppet_agent::service_names

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-puppet_agent",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": "puppetlabs",
   "summary": "Upgrades All-In-One Puppet Agents",
   "license": "Apache-2.0",
@@ -62,7 +62,8 @@
       "operatingsystemrelease": [
         "14.04",
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {
@@ -108,7 +109,9 @@
       "operatingsystem": "OSX",
       "operatingsystemrelease": [
         "10.12",
-        "10.13"
+        "10.13",
+        "10.14",
+        "10.15"
        ]
     }
   ],

spec/classes/puppet_agent_osfamily_darwin_spec.rb

@@ -30,7 +30,7 @@
   describe 'supported environment' do
     let(:params) {{ package_version: package_version }}
     context "when running a supported OSX" do
-      ["osx-10.12-x86_64", "osx-10.13-x86_64", "osx-10.14-x86_64"].each do |tag|
+      ["osx-10.12-x86_64", "osx-10.13-x86_64", "osx-10.14-x86_64", "osx-10.15-x86_64"].each do |tag|
         context "on #{tag} with no aio_version" do
           let(:osmajor) { tag.split('-')[1] }
 

tasks/install_shell.sh

@@ -573,6 +573,7 @@ case $platform in
       "16.10") deb_codename="yakkety";;
       "17.04") deb_codename="zesty";;
       "18.04") deb_codename="bionic";;
+      "20.04") deb_codename="focal";;
     esac
     filetype="deb"
     filename="${collection}-release-${deb_codename}.deb"