Merge pull request #763 from joshcooper/rpm_upgrade

Fix rpm upgrades to puppetcore

Author: mhashizume

docker/bin/helpers/run-upgrade.sh

@@ -11,10 +11,10 @@ puppet_version=( ${to_version//./ } )
 puppet_major=${puppet_version[0]}
 case $puppet_major in
 7)
-    to_collection=puppet7
+    to_collection=puppetcore7
     ;;
 8)
-    to_collection=puppet8
+    to_collection=puppetcore8
     ;;
 *)
     echo "Invalid version supplied" 1>&2

manifests/osfamily/redhat.pp

@@ -60,6 +60,9 @@
     } else {
       if $puppet_agent::collection == 'PC1' {
         $source = "${puppet_agent::yum_source}/${platform_and_version}/${puppet_agent::collection}/${puppet_agent::arch}"
+      } elsif $puppet_agent::collection =~ /core/ {
+        $_collection = regsubst($puppet_agent::collection, /core/, '')
+        $source = "https://yum-puppetcore.puppet.com/${_collection}/${platform_and_version}/${puppet_agent::arch}"
       } else {
         $source = "${puppet_agent::yum_source}/${puppet_agent::collection}/${platform_and_version}/${puppet_agent::arch}"
       }

manifests/osfamily/suse.pp

@@ -50,6 +50,9 @@
     } else {
       if $puppet_agent::collection == 'PC1' {
         $source = "${puppet_agent::yum_source}/sles/${facts['os']['release']['major']}/${puppet_agent::collection}/${puppet_agent::arch}"
+      } elsif $puppet_agent::collection =~ /core/ {
+        $_collection = regsubst($puppet_agent::collection, /core/, '')
+        $source = "https://yum-puppetcore.puppet.com/${_collection}/sles/${facts['os']['release']['major']}/${puppet_agent::arch}"
       } else {
         $source = "${puppet_agent::yum_source}/${puppet_agent::collection}/sles/${facts['os']['release']['major']}/${puppet_agent::arch}"
       }