beaker-pe 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d489d0aec55279c22ee7c655f3becf5d1dd8b04c
-  data.tar.gz: 0097776b4d29049f559cbc7812e052c7c902c6c2
+  metadata.gz: 97bd6a543781b23b5db74e34d21bf25090df35b2
+  data.tar.gz: e4c3a2042167ac2d97cb32785eaf81f98fc15d56
 SHA512:
-  metadata.gz: 13203aa9ab9d23a07434ce414696c35aa4e513a0488a10eb0a0a842fedb554e6fe1f6dc2c67c56bd204396a8a2604aa1fc192a9f2f0fddba3eee74680810ff08
-  data.tar.gz: cfa8218a3cf30dbeff6c2e41ae9601505e709604451ab447a47816ff036d6a9ad6132eea0bc1e3abba6de10926d637f98d61c0ee164c598786b82bb3d609bc20
+  metadata.gz: 667cd0c54bb1f9aa9dd2e014322fb866d5313a793ce8ccdd9032bf3a66ea4c9951f5534dfd9d76b15b32a2278b3e69ea329e9531a890624d094d41e239447376
+  data.tar.gz: cdba8e5acabb39ee557c7d914349bc280e374283e293eb5c080fdaa3e9fde1c47def8ae881325a6a2f3b7a62c70adbd7cdd01225b6854fb66253f709ff9732a6

data/lib/beaker-pe/install/pe_utils.rb

@@ -738,9 +738,11 @@ module Beaker
               on host, "curl --proxy #{@proxy_hostname}:3128 http://#{@osmirror_host}", :acceptable_exit_codes => [0]
               # Verify we can't reach it without the proxy
               on host, "curl -k http://#{@osmirror_host} -m 5", :acceptable_exit_codes => [28]
+              # For ubuntu we configure Apt to use a proxy globally
               if host.host_hash[:platform].include?("ubuntu")
                 on host, "echo 'Acquire::http::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
                 on host, "echo 'Acquire::https::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
+              # For SLES we configure ENV variables to use a proxy, then set no_proxy on master and possible CM
               elsif host.host_hash[:platform].include?("sles")
                 on host, 'rm /etc/sysconfig/proxy'
                 on host, 'echo "PROXY_ENABLED=\"yes\"" >> /etc/sysconfig/proxy'
@@ -752,12 +754,9 @@ module Beaker
                   no_proxy_list.concat(",#{compile_master}")
                 end
                 on host, "echo \"NO_PROXY='#{no_proxy_list}'\" >> /etc/sysconfig/proxy"
+              # For Redhat/Centos we configre Yum globally to use a proxy
               else
-                #Hacky work around until we configure puppet_enteprise::repo::config to set proxy=_none_ in the puppet_enteprrise.repo
-                repo_list = on(host, "ls /etc/yum.repos.d/").output.strip.split("\n")
-                repo_list.each do |repo|
-                  on host, "echo \"proxy=http://#{@proxy_hostname}:3128\" >> /etc/yum.repos.d/#{repo}"
-                end
+                on host, "echo 'proxy=http://#{@proxy_hostname}:3128' >> /etc/yum.conf"
               end
             end
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.0'
+        STRING = '2.11.1'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec