Merge pull request #586 from BobosilaVictor/MODULES-11214/puppet-agent-darwin

(MODULES-11214) Wrong url generated for darwin 11

Author: ciprianbadescu

acceptance/tests/test_upgrade_puppet6_to_puppet7.rb

@@ -23,6 +23,7 @@ class { puppet_agent:
     package_version => $_package_version,
     apt_source      => 'http://nightlies.puppet.com/apt',
     yum_source      => 'http://nightlies.puppet.com/yum',
+    mac_source      => 'http://nightlies.puppet.com/downloads',
     windows_source  => 'http://nightlies.puppet.com/downloads',
     collection      => 'puppet7-nightly',
     service_names   => []

manifests/osfamily/darwin.pp

@@ -20,7 +20,7 @@
       $source = "puppet:///pe_packages/${pe_server_version}/${::platform_tag}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
     }
   } else {
-    $source = "${::puppet_agent::mac_source}/mac/${::puppet_agent::collection}/${::macosx_productversion_major}/${::puppet_agent::arch}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
+    $source = "${::puppet_agent::mac_source}/mac/${::puppet_agent::collection}/${productversion_major}/${::puppet_agent::arch}/${puppet_agent::package_name}-${::puppet_agent::prepare::package_version}-1.osx${$productversion_major}.dmg"
   }
 
   class { '::puppet_agent::prepare::package':