pe_utils.rb in beaker-pe-1.34.0

- old
+ new

@@ -567,17 +567,20 @@
           generate_installer_conf_file_for(master, [master], opts)
           step "Install PE on master" do
             on master, installer_cmd(master, opts)
           end
 
-          install_agents_only_on(agents, opts)
+          step "Stop agent on master" do
+            stop_agent_on(master)
+          end
 
           step "Run puppet to setup mcollective and pxp-agent" do
             on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
-            run_puppet_on_non_infrastructure_nodes(all_hosts)
           end
 
+          install_agents_only_on(agents, opts)
+
           step "Run puppet a second time on the primary to populate services.conf (PE-19054)" do
             on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
           end
         end
 
@@ -595,10 +598,11 @@
             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
+            # the next two lines clear the internal puppet lan
+            on master, "iptables -A OUTPUT -p tcp -d 10.16.0.0/16 -j ACCEPT"
             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"