beaker-pe 1.31.0 → 1.32.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU5OWMzNmI1ODNjYzFhY2I4ZGNiMGYzZjVmZTc0OTEzYWEyNTNkZg==
+    MzczZjEzZjYxOWNhZDY3NmRmNmYzNDZmOGIwMzgzMzk4NTRiMGNkMA==
   data.tar.gz: !binary |-
-    MDc4NmNiZmM4NzUwNGZjM2JmZjFkYWY1ODQxMTc0YzFjMDJkNTljYg==
+    MThjZDMxNDdjYmE5MzM1ODE0OWUzM2Q3NDcyYjNkMWM0NzMwNTdmYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjhlNWEyMWUyYTI0NjE5MGViNjQwYjNmNjU5N2QzODhiM2ZhZmRhZTEyNGE1
-    ZmQ3NjFhNmU0NTFjZjZiYjVmNjY4NDEwZTRhMDFmYWEwYmE1OTdmZDYzYjRm
-    MGQ5YTJmZmU2ODA2MjA1NmVmMzk0OWQzNzMyODBkMDdhMzNjZGM=
+    OTkyNTY1MGRhNDQyMTU5OGI2MmYzMjBmODgxOWZhYWY1MzdlNDBjZDIyM2Ji
+    YTY4NTQ5NmFmMWZlNTFmZjVkNDA2ODZjMzgyYzU1OGMxNWI0Y2E4MjNkZDdh
+    M2U4NjkzYWMxZjUwZTYwN2M1MjNiZDUyMTVkMTk1NjNlMmJjMmM=
   data.tar.gz: !binary |-
-    MjFiZjA3ODI0NWZhM2ZlN2YyZTIyNTBiZTUzOTIzNWZjZTFhMjFkNTlhYzgy
-    NWVjOTM3ZmRlMGVmYmIyOWQwMzVmNTM4ZTI5NzI5MzQ3ZmJhMWUyOWQ0Mzc2
-    ZDM3N2JkZjE2ZGM5NzZmYTAyZDIxZTI2YWFmOWIzMmUyZmZiN2U=
+    NzBkYjQzNzU5N2Q3NjNkYmQ1MTM2NjUyNTMwY2M1NzU2NjUxZDk1MTMyYmZm
+    MzdjOWE0NmI5ZDZkNmIwMjVmNDk3ZDVmMmMyNWM1NDNlODUyZjJmNzg4ODc4
+    ZmQ4MTBhNTBlYTVmMGM4ODcwZDc2MWM5Y2JiZWVhOWQ0MDE0ODc=

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

@@ -480,6 +480,9 @@ module Beaker
         def do_install hosts, opts = {}
           # detect the kind of install we're doing
           install_type = determine_install_type(hosts, opts)
+          if opts[:use_proxy]
+            config_master_for_proxy_access
+          end
           case install_type
           when :pe_managed_postgres
             do_install_pe_with_pe_managed_external_postgres(hosts,opts)
@@ -578,6 +581,40 @@ module Beaker
           end
         end
 
+
+        # Configure the master to use a proxy and drop unproxied connections
+        def config_master_for_proxy_access
+          step "configuring master to use proxy" do
+            @osmirror_host = "osmirror.delivery.puppetlabs.net"
+            @osmirror_host_ip = IPSocket.getaddress(@osmirror_host)
+            @delivery_host = "enterprise.delivery.puppetlabs.net"
+            @delivery_host_ip = IPSocket.getaddress(@delivery_host)
+            @proxy_ip = @options[:proxy_ip]
+            @proxy_hostname = @options[:proxy_hostname]
+            @master_ip = on master, "hostname -I | tr '\n' ' '"
+            on master, "echo \"#{@proxy_ip}  #{@proxy_hostname}\" >> /etc/hosts"
+            on master, "echo \"#{@master_ip.stdout}  #{master.connection.vmhostname}\" >> /etc/hosts"
+            on master, "echo \"#{@osmirror_host_ip}    #{@osmirror_host}\" >> /etc/hosts"
+            on master, "echo \"#{@delivery_host_ip}    #{@delivery_host}\" >> /etc/hosts"
+            on master, "iptables -A OUTPUT -p tcp -d #{master.connection.vmhostname} -j ACCEPT"
+            # internal puppet lan
+            on master, "iptables -A OUTPUT -p tcp -d 10.32.0.0/16 -j ACCEPT"
+            on master, "iptables -A OUTPUT -p tcp --dport 3128 -d #{@proxy_hostname} -j ACCEPT"
+            on master, "iptables -A OUTPUT -p tcp -d #{@osmirror_host_ip} -j DROP"
+            on master, "iptables -A OUTPUT -p tcp -d #{@delivery_host_ip} -j DROP"
+            on master, "iptables -P OUTPUT DROP"
+            on master, "curl --proxy #{@proxy_hostname}:3128 http://#{@osmirror_host}", :acceptable_exit_codes => [0]
+            on master, "curl -k https://#{@osmirror_host}", :acceptable_exit_codes => [1,7]
+            if master.host_hash[:platform].include?("ubuntu")
+              on master, "echo 'Acquire::http::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
+              on master, "echo 'Acquire::https::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
+            else
+              on master, "echo \"proxy=http://#{@proxy_hostname}:3128\" >> /etc/yum.conf"
+            end
+          end
+        end
+
+
         def generic_install hosts, opts = {}
           step "Installing PE on a generic set of hosts"
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.31.0'
+        STRING = '1.32.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec