(PE-42498) re-add puppet and facter logic

Author: davidmalloncares

Gemfile

@@ -58,8 +58,6 @@ hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}
 
-gems['puppet'] = location_for(puppet_version)
-
 bolt_version = ENV.fetch('BOLT_GEM_VERSION', nil)
 # output value of bolt_version for debugging purposes
 puts "BOLT_GEM_VERSION is set to: #{bolt_version}" unless bolt_version.nil?
@@ -68,13 +66,16 @@ puts "BOLT_GEM_VERSION is set to: #{bolt_version}" unless bolt_version.nil?
 # Otherwise, do as before and use location_for to fetch gems from the default source
 if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
   gems['bolt'] = [bolt_version || '~> 5.0', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+  gems['puppet'] = [puppet_version || '~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+  gems['facter'] = [facter_version || '~> 4.0', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
 else
   gems['bolt'] = location_for(bolt_version)
+  gems['puppet'] = location_for(puppet_version)
+  gems['facter'] = location_for(facter_version) if facter_version  
 end
 
-# If facter or hiera versions have been specified via the environment
+# If hiera version have been specified via the environment
 # variables
-gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
 gems.each do |gem_name, gem_params|