Skip to content

Commit caaa31d

Browse files
committed
(PE-37302) Update puppet_agent module for recent AIX changes in PE
1 parent 2920159 commit caaa31d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

manifests/osfamily/aix.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
if $puppet_agent::absolute_source {
5252
$source = $puppet_agent::absolute_source
5353
} elsif $puppet_agent::alternate_pe_source {
54-
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/aix-${aix_ver_number}-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
54+
$source = "${puppet_agent::alternate_pe_source}/packages/${pe_server_version}/aix-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
5555
} elsif $puppet_agent::source {
56-
$source = "${puppet_agent::source}/packages/${pe_server_version}/aix-${aix_ver_number}-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
56+
$source = "${puppet_agent::source}/packages/${pe_server_version}/aix-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
5757
} else {
58-
$source = "${puppet_agent::aix_source}/${pe_server_version}/aix-${aix_ver_number}-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
58+
$source = "${puppet_agent::aix_source}/${pe_server_version}/aix-power/${puppet_agent::package_name}-${puppet_agent::prepare::package_version}-1.aix${aix_ver_number}.ppc.rpm"
5959
}
6060

6161
class { 'puppet_agent::prepare::package':

spec/classes/puppet_agent_osfamily_aix_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
shared_examples 'aix' do |aixver, pkg_aixver, powerver|
2525
let(:rpmname) { "puppet-agent-#{params[:package_version]}-1.aix#{pkg_aixver}.ppc.rpm" }
26-
let(:tag) { "aix-#{pkg_aixver}-power" }
26+
let(:tag) { 'aix-power' }
2727
let(:source) { "puppet:///pe_packages/2000.0.0/#{tag}/#{rpmname}" }
2828
let(:facts) do
2929
common_facts.merge({
@@ -76,7 +76,7 @@
7676
end
7777

7878
it {
79-
is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-7.10.100.1-1.aix7.1.ppc.rpm').with_source('https://fake-pe-master.com/packages/2000.0.0/aix-7.1-power/puppet-agent-7.10.100.1-1.aix7.1.ppc.rpm')
79+
is_expected.to contain_file('/opt/puppetlabs/packages/puppet-agent-7.10.100.1-1.aix7.1.ppc.rpm').with_source('https://fake-pe-master.com/packages/2000.0.0/aix-power/puppet-agent-7.10.100.1-1.aix7.1.ppc.rpm')
8080
}
8181
end
8282

0 commit comments

Comments
 (0)