From 3b20c22c573b28dbad4341eb12a7840ef54dc1ea Mon Sep 17 00:00:00 2001 From: Paul Bailey Date: Tue, 11 Oct 2016 13:26:31 -0500 Subject: [PATCH] update puppet windows agent download url --- manifests/init.pp | 2 +- spec/classes/puppet_agent_windows_install_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bda17b3f4..55a981e0b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -118,7 +118,7 @@ if $is_pe { $_package_file_name = "${package_name}-${_arch}.msi" } elsif $package_version != undef { - $_package_file_name = "${package_name}-${_arch}-${package_version}.msi" + $_package_file_name = "${package_name}-${package_version}-${_arch}.msi" } else { $_package_file_name = "${package_name}-${_arch}-latest.msi" } diff --git a/spec/classes/puppet_agent_windows_install_spec.rb b/spec/classes/puppet_agent_windows_install_spec.rb index da62a277a..ec6e4b91c 100644 --- a/spec/classes/puppet_agent_windows_install_spec.rb +++ b/spec/classes/puppet_agent_windows_install_spec.rb @@ -155,7 +155,7 @@ describe 'default source' do it { is_expected.to contain_file('C:\tmp\install_puppet.bat').with_content( - /msiexec.exe \/qn \/norestart \/i "https:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-#{values[:expect_arch]}-#{package_version}\.msi"/) + /msiexec.exe \/qn \/norestart \/i "https:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-#{package_version}-#{values[:expect_arch]}\.msi"/) is_expected.to contain_file('C:\tmp\install_puppet.bat').with_content(/\/l\*vx "C:\\tmp\\puppet-\d+_\d+_\d+-\d+_\d+-installer\.log"/) } it { @@ -188,7 +188,7 @@ } it { is_expected.to contain_file('C:\tmp\install_puppet.bat').with_content( - /msiexec.exe \/qn \/norestart \/i "https:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-x86-#{package_version}\.msi"/ + /msiexec.exe \/qn \/norestart \/i "https:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-#{package_version}-x86.msi"/ ) } end