10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.4.1] - 2017-07-18

### Summary
This is a bug-fix release

### Bug fixes
- The system package provider is explicitly selected on Solaris 10 for installing puppet-agent ([MODULES-4547](https://tickets.puppetlabs.com/browse/MODULES-4547))
- `puppet lookup` and other operations with `strict_variables` enabled will now work with this module ([MODULES-5168](https://tickets.puppetlabs.com/browse/MODULES-5168))
- Use HTTP instead of HTTPS for RedHat repositories. This is consistent with Puppet's repo packages, and continues to use GPG signing for security.

## [1.4.0] - 2017-06-12

### Summary
Expand Down
1 change: 1 addition & 0 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

$_unzipped_package_name = regsubst($package_file_name, '\.gz$', '')
$_package_options = {
provider => 'sun',
adminfile => '/opt/puppetlabs/packages/solaris-noask',
source => "/opt/puppetlabs/packages/${_unzipped_package_name}",
require => Class['puppet_agent::install::remove_packages'],
Expand Down
2 changes: 1 addition & 1 deletion manifests/osfamily/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
$_sslclientcert_path = undef
$_sslclientkey_path = undef
$source = getvar('::puppet_agent::source') ? {
undef => "https://yum.puppetlabs.com/${urlbit}/${pa_collection}/${::architecture}",
undef => "http://yum.puppetlabs.com/${urlbit}/${pa_collection}/${::architecture}",
default => getvar('::puppet_agent::source'),
}
}
Expand Down
3 changes: 1 addition & 2 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
# It sets variables according to platform.
#
class puppet_agent::params {

if $::puppet_stringify_facts {
if (versioncmp("${::clientversion}", '4.0.0') < 0 and $::puppet_stringify_facts == true) {
fail('The puppet_agent class requires stringify_facts to be disabled')
}

Expand Down
15 changes: 9 additions & 6 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-puppet_agent",
"version": "1.4.0",
"version": "1.4.1",
"author": "puppetlabs",
"summary": "Upgrades Puppet 3.7+ and All-In-One Puppet Agents",
"license": "Apache-2.0",
Expand Down Expand Up @@ -60,19 +60,21 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"12.04",
"14.04",
"15.04",
"15.10",
"16.04"
"16.04",
"16.10"
]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"22",
"23"
"23",
"24",
"25"
]
},
{
Expand Down Expand Up @@ -112,14 +114,15 @@
"operatingsystemrelease": [
"10.9",
"10.10",
"10.11"
"10.11",
"10.12"
]
}
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 3.7.0 < 5.0.0"
"version_requirement": ">= 3.7.0 < 6.0.0"
}
],
"dependencies": [
Expand Down
2 changes: 2 additions & 0 deletions spec/classes/coverage_spec.rb
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
require 'spec_helper'

at_exit { RSpec::Puppet::Coverage.report! }
2 changes: 1 addition & 1 deletion spec/classes/puppet_agent_osfamily_redhat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}
it { is_expected.not_to contain_yumrepo('puppetlabs-pepackages').with_ensure('absent') }
it { is_expected.to contain_yumrepo('pc_repo').with({
'baseurl' => "https://yum.puppetlabs.com/#{urlbit}/PC1/x64",
'baseurl' => "http://yum.puppetlabs.com/#{urlbit}/PC1/x64",
'enabled' => 'true',
'gpgcheck' => '1',
'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs\n file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet",
Expand Down
12 changes: 7 additions & 5 deletions spec/classes/puppet_agent_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,18 @@ def global_facts(facts, os)
describe 'when puppet_stringify_facts evaluates as true ' do
# Mock a supported agent but with puppet_stringify_facts set to true
let(:facts) {{
:osfamily => 'windows',
:operatingsystem => '',
:osfamily => 'RedHat',
:operatingsystem => 'Fedora',
:puppet_ssldir => '/dev/null/ssl',
:puppet_config => '/dev/null/puppet.conf',
:architecture => 'i386',
:puppet_stringify_facts => true,
}}
let(:params) { global_params }

it { is_expected.to raise_error(Puppet::Error, /requires stringify_facts to be disabled/) }

if Puppet.version < '4.0.0'
it { is_expected.to raise_error(Puppet::Error, /requires stringify_facts to be disabled/) }
end
end
end
end
end
3 changes: 1 addition & 2 deletions spec/spec_helper_local.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

RSpec.configure do |c|
c.default_facts = {
:puppet_stringify_facts => false,
:aio_agent_version => nil,
:puppetversion => nil,
:lsbdistrelease => nil,
Expand Down Expand Up @@ -51,4 +50,4 @@
},
},
}
end
end