Showing with 15 additions and 1 deletion.
  1. +8 −0 CHANGELOG.md
  2. +1 −0 Gemfile
  3. +1 −1 metadata.json
  4. +5 −0 tasks/install_powershell.ps1
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [2.2.2] - 2019-11-7

### Summary
Support for puppet nightly collection on Windows(puppet_agent::install task).

### Features
- Puppet Agent module downloads the wrong nightly builds for Windows ([MODULES-10038](https://tickets.puppetlabs.com/browse/MODULES-10038))

## [2.2.1] - 2019-10-21

### Summary
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
#end

group :development do
gem "puppet-lint", '2.3.6'
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"
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-puppet_agent",
"version": "2.2.1",
"version": "2.2.2",
"author": "puppetlabs",
"summary": "Upgrades All-In-One Puppet Agents",
"license": "Apache-2.0",
Expand Down
5 changes: 5 additions & 0 deletions tasks/install_powershell.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ else {
$msi_name = "puppet-agent-${arch}-latest.msi"
}

# Change windows_source only if the collection is a nightly build, and the source was not explicitly specified.
if (($collection -like '*nightly*') -And -Not ($PSBoundParameters.ContainsKey('windows_source'))) {
$windows_source = 'https://nightlies.puppet.com/downloads'
}

$msi_source = "$windows_source/windows/${collection}/${msi_name}"

$date_time_stamp = (Get-Date -format s) -replace ':', '-'
Expand Down