update puppet windows agent download url

puppetlabs · Oct 11, 2016 · 3b20c22 · 3b20c22
1 parent 676076d
commit 3b20c22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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