Merge pull request puppetlabs#247 from branan/puppet5_yum_support

(MODULES-5633) Add support for Puppet 5 on Redhat osfamily

Author: MikaelSmith

manifests/osfamily/redhat.pp

@@ -3,8 +3,14 @@
 ) {
   assert_private()
 
+  $pa_collection = getvar('::puppet_agent::collection')
+
   if $::operatingsystem == 'Fedora' {
-    $urlbit = 'fedora/f$releasever'
+    if $pa_collection == 'PC1' {
+      $urlbit = 'fedora/f$releasever'
+    } else {
+      $urlbit = 'fedora/$releasever'
+    }
   }
   elsif $::operatingsystem == 'Amazon' {
     $urlbit = 'el/6'
@@ -13,8 +19,6 @@
     $urlbit = 'el/$releasever'
   }
 
-  $pa_collection = getvar('::puppet_agent::collection')
-
   if getvar('::puppet_agent::is_pe') == true {
     # In Puppet Enterprise, agent packages are served by the same server
     # as the master, which can be using either a self signed CA, or an external CA.
@@ -42,8 +46,14 @@
     $_sslcacert_path = undef
     $_sslclientcert_path = undef
     $_sslclientkey_path = undef
+
+    if $pa_collection == 'PC1' {
+      $_default_source = "http://yum.puppetlabs.com/${urlbit}/${pa_collection}/${::architecture}"
+    } else {
+      $_default_source = "http://yum.puppetlabs.com/${pa_collection}/${urlbit}/${::architecture}"
+    }
     $source = getvar('::puppet_agent::source') ? {
-      undef   => "http://yum.puppetlabs.com/${urlbit}/${pa_collection}/${::architecture}",
+      undef   => $_default_source,
       default => getvar('::puppet_agent::source'),
     }
   }

spec/classes/puppet_agent_osfamily_redhat_spec.rb

@@ -89,6 +89,21 @@
         it { is_expected.to contain_class("puppet_agent::osfamily::redhat") }
       end
 
+      context 'when installing a puppet5 project' do
+        let(:params)  {
+          {
+            :package_version => '5.2.0',
+            :collection => 'puppet5'
+          }
+        }
+        it { is_expected.to contain_yumrepo('pc_repo').with({
+          # We no longer expect the 'f' in fedora repos
+          'baseurl' => "http://yum.puppetlabs.com/puppet5/#{urlbit.gsub('/f','/')}/x64",
+          'enabled' => 'true',
+            'gpgcheck' => '1',
+            'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppetlabs\n  file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet",
+        }) }
+      end
     end
   end