beaker-pe 1.32.0 → 1.34.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzczZjEzZjYxOWNhZDY3NmRmNmYzNDZmOGIwMzgzMzk4NTRiMGNkMA==
-  data.tar.gz: !binary |-
-    MThjZDMxNDdjYmE5MzM1ODE0OWUzM2Q3NDcyYjNkMWM0NzMwNTdmYQ==
+SHA1:
+  metadata.gz: dddeba9ddd4a3de4df7e891a16a387118dc418c4
+  data.tar.gz: 2526af158f14ee628af8e2264fc2573d004ca7fd
 SHA512:
-  metadata.gz: !binary |-
-    OTkyNTY1MGRhNDQyMTU5OGI2MmYzMjBmODgxOWZhYWY1MzdlNDBjZDIyM2Ji
-    YTY4NTQ5NmFmMWZlNTFmZjVkNDA2ODZjMzgyYzU1OGMxNWI0Y2E4MjNkZDdh
-    M2U4NjkzYWMxZjUwZTYwN2M1MjNiZDUyMTVkMTk1NjNlMmJjMmM=
-  data.tar.gz: !binary |-
-    NzBkYjQzNzU5N2Q3NjNkYmQ1MTM2NjUyNTMwY2M1NzU2NjUxZDk1MTMyYmZm
-    MzdjOWE0NmI5ZDZkNmIwMjVmNDk3ZDVmMmMyNWM1NDNlODUyZjJmNzg4ODc4
-    ZmQ4MTBhNTBlYTVmMGM4ODcwZDc2MWM5Y2JiZWVhOWQ0MDE0ODc=
+  metadata.gz: 6f0740c55b9cdd292e6ae4048edc86f6953227f6999511be6fbdad62c9c4fd9bb0e93a101c590e93f1bec55ef882ebb9eeb475871ad1ef48c72b636f451b3f9c
+  data.tar.gz: 50f1466cd21a57c43b16aaff85e76d3bb6878ae8359a363d4ea0dba8c45dc32a4f3420158f53928ec103804d9a11b9d9b6eb80b749297ee23e619cd9df3521ff

data/Gemfile

@@ -18,7 +18,7 @@ group :acceptance_testing do
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
 end
 
-if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
+if ENV['GEM_SOURCE'] =~ /artifactory\.delivery\.puppetlabs\.net/
   gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 3.0')
 end
 

data/README.md

@@ -39,7 +39,7 @@ things:
 
 # Gem Installing
 Spec tests require a version of scooter that is private. Execute
-`export GEM_SOURCE=http://rubygems.delivery.puppetlabs.net` prior to running
+`export GEM_SOURCE=https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/` prior to running
 `bundle install --path .bundle/gems/`.
 
 # Spec Testing

data/beaker-pe.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
+  s.add_runtime_dependency 'beaker-abs'
 
 end
 

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

@@ -569,13 +569,16 @@ module Beaker
             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
@@ -597,7 +600,8 @@ module Beaker
             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"

data/lib/beaker-pe/version.rb

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

metadata

@@ -1,169 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.32.0
+  version: 1.34.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-answers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-abs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Puppet Enterprise (PE) Install & Helper library
 email:
 - qe-team@puppetlabs.com
@@ -172,9 +186,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .simplecov
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -217,17 +231,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!