beaker-pe 2.0.1 → 2.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/beaker-pe/install/pe_defaults.rb +4 -4
- data/lib/beaker-pe/install/pe_utils.rb +1 -2
- data/lib/beaker-pe/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4669811fd96282e6cbb309d4d65eb083e25e5222
|
|
4
|
+
data.tar.gz: f28009cebec926e2ade3db68ce801ab958208718
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d96ae7fc50c9a581781519459735ed8923a843b110f1ad0d9827c8e46b617c333287ad7353dbb915ebf7c12bb4f5d351e73cd8ed21d583b6097db1b8e6e47e88
|
|
7
|
+
data.tar.gz: 25a4f33451f1faa88aa410c209980ffa607c77f5fba71df18b504b0acc8b3b42be8f83221fae6f7eca17b44f95395fb965bcc2a79c9c5b01569b68d152e73be6
|
|
@@ -21,7 +21,7 @@ module Beaker
|
|
|
21
21
|
'puppetvardir' => '/var/opt/lib/pe-puppet',
|
|
22
22
|
'hieradatadir' => '/var/lib/hiera',
|
|
23
23
|
'hieraconf' => '/etc/puppetlabs/puppet/hiera.yaml',
|
|
24
|
-
'distmoduledir' => '/etc/puppetlabs/
|
|
24
|
+
'distmoduledir' => '/etc/puppetlabs/code/modules',
|
|
25
25
|
'sitemoduledir' => '/opt/puppet/share/puppet/modules',
|
|
26
26
|
},
|
|
27
27
|
'unix' => {
|
|
@@ -36,7 +36,7 @@ module Beaker
|
|
|
36
36
|
'puppetvardir' => '/var/opt/lib/pe-puppet',
|
|
37
37
|
'hieradatadir' => '/var/lib/hiera',
|
|
38
38
|
'hieraconf' => '/etc/puppetlabs/puppet/hiera.yaml',
|
|
39
|
-
'distmoduledir' => '/etc/puppetlabs/
|
|
39
|
+
'distmoduledir' => '/etc/puppetlabs/code/modules',
|
|
40
40
|
'sitemoduledir' => '/opt/puppet/share/puppet/modules',
|
|
41
41
|
},
|
|
42
42
|
'windows' => { #cygwin windows
|
|
@@ -46,7 +46,7 @@ module Beaker
|
|
|
46
46
|
'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
|
|
47
47
|
'hieraconf' => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
|
|
48
48
|
'puppetvardir' => '`cygpath -smF 35`/PuppetLabs/puppet/var',
|
|
49
|
-
'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/
|
|
49
|
+
'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/code/modules',
|
|
50
50
|
'sitemoduledir' => 'C:/usr/share/puppet/modules',
|
|
51
51
|
#let's just add both potential bin dirs to the path
|
|
52
52
|
'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
|
|
|
58
58
|
'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
|
|
59
59
|
'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
|
|
60
60
|
'hieraconf' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\hiera.yaml',
|
|
61
|
-
'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\
|
|
61
|
+
'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
|
|
62
62
|
'sitemoduledir' => 'C:\\usr\\share\\puppet\\modules',
|
|
63
63
|
'puppetvardir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\var',
|
|
64
64
|
'puppetbindir' => '"C:\\Program Files (x86)\\PuppetLabs\\Puppet Enterprise\\bin";"C:\\Program Files\\PuppetLabs\\Puppet Enterprise\\bin"'
|
|
@@ -1500,8 +1500,6 @@ module Beaker
|
|
|
1500
1500
|
pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database', 'pe_postgres']}, hosts)
|
|
1501
1501
|
non_infrastructure = hosts.reject{|host| pe_infrastructure.include? host}
|
|
1502
1502
|
|
|
1503
|
-
configure_type_defaults_on([master])
|
|
1504
|
-
|
|
1505
1503
|
is_upgrade = (original_pe_ver(hosts[0]) != hosts[0][:pe_ver])
|
|
1506
1504
|
step "Setup tmp installer directory and pe.conf" do
|
|
1507
1505
|
|
|
@@ -1510,6 +1508,7 @@ module Beaker
|
|
|
1510
1508
|
fetch_pe(pe_infrastructure,opts)
|
|
1511
1509
|
|
|
1512
1510
|
[master, database, dashboard, pe_postgres].uniq.each do |host|
|
|
1511
|
+
configure_type_defaults_on(host)
|
|
1513
1512
|
prepare_host_installer_options(host)
|
|
1514
1513
|
|
|
1515
1514
|
unless is_upgrade
|
data/lib/beaker-pe/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker-pe
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Puppetlabs
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-09-
|
|
11
|
+
date: 2018-09-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rspec
|