beaker-pe 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d171f5c4ebf9878768dca6ad8e2ad841be1b0efc
-  data.tar.gz: 1474d5a9315d3470b2955977ac30d04b0579677c
+  metadata.gz: 4669811fd96282e6cbb309d4d65eb083e25e5222
+  data.tar.gz: f28009cebec926e2ade3db68ce801ab958208718
 SHA512:
-  metadata.gz: ba32d316fc2a40c7c92c45581622478a03854f4d10756947ed4f8f50afd87ef3405e80c7fb262d9d192a608bbba77ff6cd719cea7d87dd9a740fd7f8ec544d17
-  data.tar.gz: 45119e8a0b64b9be9529c0363a70b4d81c04665a05298c79ef0a1a830f8538aaaae6b0773113be9e94d5b67c925ffe09d2aafc11508a6cb67fccb481374944c8
+  metadata.gz: d96ae7fc50c9a581781519459735ed8923a843b110f1ad0d9827c8e46b617c333287ad7353dbb915ebf7c12bb4f5d351e73cd8ed21d583b6097db1b8e6e47e88
+  data.tar.gz: 25a4f33451f1faa88aa410c209980ffa607c77f5fba71df18b504b0acc8b3b42be8f83221fae6f7eca17b44f95395fb965bcc2a79c9c5b01569b68d152e73be6

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

@@ -21,7 +21,7 @@ module Beaker
             'puppetvardir'     => '/var/opt/lib/pe-puppet',
             'hieradatadir'     => '/var/lib/hiera',
             'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
-            'distmoduledir'    => '/etc/puppetlabs/puppet/modules',
+            'distmoduledir'    => '/etc/puppetlabs/code/modules',
             'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
           },
           'unix' => {
@@ -36,7 +36,7 @@ module Beaker
             'puppetvardir'     => '/var/opt/lib/pe-puppet',
             'hieradatadir'     => '/var/lib/hiera',
             'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
-            'distmoduledir'    => '/etc/puppetlabs/puppet/modules',
+            'distmoduledir'    => '/etc/puppetlabs/code/modules',
             'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
           },
           'windows' => { #cygwin windows
@@ -46,7 +46,7 @@ module Beaker
             'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'hieraconf'     => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
             'puppetvardir'  => '`cygpath -smF 35`/PuppetLabs/puppet/var',
-            'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
+            'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/code/modules',
             'sitemoduledir' => 'C:/usr/share/puppet/modules',
             #let's just add both potential bin dirs to the path
             'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/bin',
@@ -58,7 +58,7 @@ module Beaker
             'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'hieraconf'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\hiera.yaml',
-            'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
+            'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
             'sitemoduledir' => 'C:\\usr\\share\\puppet\\modules',
             'puppetvardir'  => 'C:\\ProgramData\\PuppetLabs\\puppet\\var',
             'puppetbindir'  => '"C:\\Program Files (x86)\\PuppetLabs\\Puppet Enterprise\\bin";"C:\\Program Files\\PuppetLabs\\Puppet Enterprise\\bin"'

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

@@ -1500,8 +1500,6 @@ module Beaker
           pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database', 'pe_postgres']}, hosts)
           non_infrastructure = hosts.reject{|host| pe_infrastructure.include? host}
 
-          configure_type_defaults_on([master])
-
           is_upgrade = (original_pe_ver(hosts[0]) != hosts[0][:pe_ver])
           step "Setup tmp installer directory and pe.conf" do
 
@@ -1510,6 +1508,7 @@ module Beaker
             fetch_pe(pe_infrastructure,opts)
 
             [master, database, dashboard, pe_postgres].uniq.each do |host|
+              configure_type_defaults_on(host)
               prepare_host_installer_options(host)
 
               unless is_upgrade

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.0.1'
+        STRING = '2.0.2'
       end
 
     end

metadata

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