vagrant-pe_build 0.15.0 → 0.15.1
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/.travis.yml +2 -2
- data/CHANGELOG +10 -0
- data/Gemfile +1 -1
- data/acceptance/pe_build/pe_bootstrap_2015x_spec.rb +11 -39
- data/acceptance/pe_build/pe_bootstrap_2016x_spec.rb +96 -0
- data/acceptance/skeletons/2015x_acceptance/Vagrantfile +10 -37
- data/acceptance/skeletons/2016x_acceptance/Vagrantfile +72 -0
- data/acceptance/skeletons/pe_build/Vagrantfile +2 -2
- data/lib/pe_build/cap/run_install/posix.rb +0 -25
- data/lib/pe_build/provisioner/pe_bootstrap.rb +2 -7
- data/lib/pe_build/release.rb +1 -1
- data/lib/pe_build/version.rb +1 -1
- data/tasks/acceptance.rake +2 -2
- data/templates/answers/master-2016.2.x.conf.erb +3 -11
- data/vagrant-spec.config.example.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8dc01290aa45e6619f916cdb4d4ca76a93cf8fe1
|
4
|
+
data.tar.gz: e2a29d63fed2279bb649327c55c8d74add771839
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 329f0132800aa03e946e2b899846d046f4297d5611d500d553c35f6972e57cdfccb3691a2bec3ee55f954275e726d5d39a2f5f68ce2b4b62384355c2450ed4af
|
7
|
+
data.tar.gz: b1174987581eaa70ab99ad200fdda48be9617ac30fffb29bac7b2b5e437915f90f9aad2c60ad557eb52d9cb5defc149a792ee93a256f0aec16a2848c5e855e8b
|
data/.travis.yml
CHANGED
@@ -20,6 +20,6 @@ matrix:
|
|
20
20
|
env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
|
21
21
|
|
22
22
|
- rvm: 2.2.3
|
23
|
-
env: TEST_VAGRANT_VERSION=v1.8.
|
23
|
+
env: TEST_VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5
|
24
24
|
- rvm: 2.2.3
|
25
|
-
env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.
|
25
|
+
env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.12.5
|
data/CHANGELOG
CHANGED
@@ -1,6 +1,16 @@
|
|
1
1
|
vagrant-pe_build
|
2
2
|
================
|
3
3
|
|
4
|
+
0.15.1
|
5
|
+
------
|
6
|
+
|
7
|
+
2016-06-21
|
8
|
+
|
9
|
+
This is a backwards compatible bugfix release.
|
10
|
+
|
11
|
+
* Minor updates to the 2016.2.0 installation template to match stock answer
|
12
|
+
files distributed with the tarball installer.
|
13
|
+
|
4
14
|
0.15.0
|
5
15
|
------
|
6
16
|
|
data/Gemfile
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 and 2015.3 shared
|
2
|
+
# the same installation workflow.
|
1
3
|
shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
|
2
4
|
if options[:boxes].empty?
|
3
5
|
raise ArgumentError,
|
@@ -30,62 +32,32 @@ shared_examples 'provider/provisioner/pe_bootstrap/2015x' do |provider, options|
|
|
30
32
|
|
31
33
|
# TODO: Refactor into a shared example so tha this testcase can be run on
|
32
34
|
# multiple versions.
|
33
|
-
context 'when installing PE
|
35
|
+
context 'when installing PE 2016.1.x' do
|
34
36
|
it 'provisions masters with pe_bootstrap and agents with pe_agent' do
|
35
37
|
status('Test: pe_bootstrap master install')
|
36
|
-
assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-
|
38
|
+
assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20161-master')
|
37
39
|
|
38
40
|
status('Test: pe_bootstrap master running after install')
|
39
41
|
result = execute('vagrant', 'ssh',
|
40
|
-
'pe-
|
42
|
+
'pe-20161-master',
|
41
43
|
'-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
|
42
44
|
expect(result).to exit_with(0)
|
43
45
|
expect(result.stdout).to match('"is_alive": true')
|
44
46
|
|
45
47
|
status('Test: pe_agent install')
|
46
|
-
result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-
|
48
|
+
result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20161-agent')
|
47
49
|
|
48
50
|
status('Test: pe_agent signed cert during install')
|
49
51
|
result = execute('vagrant', 'ssh',
|
50
|
-
'pe-
|
51
|
-
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-
|
52
|
+
'pe-20161-master',
|
53
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20161-agent.pe-bootstrap.vlan')
|
52
54
|
expect(result).to exit_with(0)
|
53
55
|
|
54
56
|
status('Test: pe_agent cert purged when vm destroyed')
|
55
|
-
result = assert_execute('vagrant', 'destroy', '-f', 'pe-
|
57
|
+
result = assert_execute('vagrant', 'destroy', '-f', 'pe-20161-agent')
|
56
58
|
result = execute('vagrant', 'ssh',
|
57
|
-
'pe-
|
58
|
-
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-
|
59
|
-
expect(result.stderr).to match(/Could not find a certificate/)
|
60
|
-
end
|
61
|
-
end
|
62
|
-
|
63
|
-
context 'when installing PE 2015.latest' do
|
64
|
-
it 'provisions masters with pe_bootstrap and agents with pe_agent' do
|
65
|
-
status('Test: pe_bootstrap master install')
|
66
|
-
assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-master')
|
67
|
-
|
68
|
-
status('Test: pe_bootstrap master running after install')
|
69
|
-
result = execute('vagrant', 'ssh',
|
70
|
-
'pe-2015latest-master',
|
71
|
-
'-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
|
72
|
-
expect(result).to exit_with(0)
|
73
|
-
expect(result.stdout).to match('"is_alive": true')
|
74
|
-
|
75
|
-
status('Test: pe_agent install')
|
76
|
-
result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2015latest-agent')
|
77
|
-
|
78
|
-
status('Test: pe_agent signed cert during install')
|
79
|
-
result = execute('vagrant', 'ssh',
|
80
|
-
'pe-2015latest-master',
|
81
|
-
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2015latest-agent.pe-bootstrap.vlan')
|
82
|
-
expect(result).to exit_with(0)
|
83
|
-
|
84
|
-
status('Test: pe_agent cert purged when vm destroyed')
|
85
|
-
result = assert_execute('vagrant', 'destroy', '-f', 'pe-2015latest-agent')
|
86
|
-
result = execute('vagrant', 'ssh',
|
87
|
-
'pe-2015latest-master',
|
88
|
-
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2015latest-agent.pe-bootstrap.vlan')
|
59
|
+
'pe-20161-master',
|
60
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20161-agent.pe-bootstrap.vlan')
|
89
61
|
expect(result.stderr).to match(/Could not find a certificate/)
|
90
62
|
end
|
91
63
|
end
|
@@ -0,0 +1,96 @@
|
|
1
|
+
# NOTE: This suite starts off with 2016.2.0 as the installation workflow
|
2
|
+
# changed in that release.
|
3
|
+
shared_examples 'provider/provisioner/pe_bootstrap/2016x' do |provider, options|
|
4
|
+
if options[:boxes].empty?
|
5
|
+
raise ArgumentError,
|
6
|
+
"Box files must be downloaded for provider: #{provider}. Try: rake acceptance:setup"
|
7
|
+
end
|
8
|
+
|
9
|
+
include_context 'acceptance'
|
10
|
+
|
11
|
+
let(:extra_env) do
|
12
|
+
vars = options[:env_vars].dup
|
13
|
+
vars['PE_BUILD_DOWNLOAD_ROOT'] = options[:archive_path]
|
14
|
+
|
15
|
+
vars
|
16
|
+
end
|
17
|
+
|
18
|
+
before(:each) do
|
19
|
+
# The skelton sets up a Vagrantfile which expects the OS under test to be
|
20
|
+
# available as `box`.
|
21
|
+
environment.skeleton('2016x_acceptance')
|
22
|
+
options[:boxes].each do |box|
|
23
|
+
name = File.basename(box).split('-').first
|
24
|
+
assert_execute('vagrant', 'box', 'add', name, box)
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
after(:each) do
|
29
|
+
# Ensure any VMs that survived tests are cleaned up.
|
30
|
+
assert_execute('vagrant', 'destroy', '--force', log: false)
|
31
|
+
end
|
32
|
+
|
33
|
+
# TODO: Refactor into a shared example so tha this testcase can be run on
|
34
|
+
# multiple versions.
|
35
|
+
context 'when installing PE 2016.2.x' do
|
36
|
+
|
37
|
+
it 'provisions masters with pe_bootstrap and agents with pe_agent' do
|
38
|
+
status('Test: pe_bootstrap master install')
|
39
|
+
assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20162-master')
|
40
|
+
|
41
|
+
status('Test: pe_bootstrap master running after install')
|
42
|
+
result = execute('vagrant', 'ssh',
|
43
|
+
'pe-20162-master',
|
44
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
|
45
|
+
expect(result).to exit_with(0)
|
46
|
+
expect(result.stdout).to match('"is_alive": true')
|
47
|
+
|
48
|
+
status('Test: pe_agent install')
|
49
|
+
result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-20162-agent')
|
50
|
+
|
51
|
+
status('Test: pe_agent signed cert during install')
|
52
|
+
result = execute('vagrant', 'ssh',
|
53
|
+
'pe-20162-master',
|
54
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20162-agent.pe-bootstrap.vlan')
|
55
|
+
expect(result).to exit_with(0)
|
56
|
+
|
57
|
+
status('Test: pe_agent cert purged when vm destroyed')
|
58
|
+
result = assert_execute('vagrant', 'destroy', '-f', 'pe-20162-agent')
|
59
|
+
result = execute('vagrant', 'ssh',
|
60
|
+
'pe-20162-master',
|
61
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-20162-agent.pe-bootstrap.vlan')
|
62
|
+
expect(result.stderr).to match(/Could not find a certificate/)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
context 'when installing PE 2016.latest' do
|
67
|
+
it 'provisions masters with pe_bootstrap and agents with pe_agent' do
|
68
|
+
status('Test: pe_bootstrap master install')
|
69
|
+
assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2016latest-master')
|
70
|
+
|
71
|
+
status('Test: pe_bootstrap master running after install')
|
72
|
+
result = execute('vagrant', 'ssh',
|
73
|
+
'pe-2016latest-master',
|
74
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet status --terminus=rest')
|
75
|
+
expect(result).to exit_with(0)
|
76
|
+
expect(result.stdout).to match('"is_alive": true')
|
77
|
+
|
78
|
+
status('Test: pe_agent install')
|
79
|
+
result = assert_execute('vagrant', 'up', "--provider=#{provider}", 'pe-2016latest-agent')
|
80
|
+
|
81
|
+
status('Test: pe_agent signed cert during install')
|
82
|
+
result = execute('vagrant', 'ssh',
|
83
|
+
'pe-2016latest-master',
|
84
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2016latest-agent.pe-bootstrap.vlan')
|
85
|
+
expect(result).to exit_with(0)
|
86
|
+
|
87
|
+
status('Test: pe_agent cert purged when vm destroyed')
|
88
|
+
result = assert_execute('vagrant', 'destroy', '-f', 'pe-2016latest-agent')
|
89
|
+
result = execute('vagrant', 'ssh',
|
90
|
+
'pe-2016latest-master',
|
91
|
+
'-c', 'sudo /opt/puppetlabs/bin/puppet cert list pe-2016latest-agent.pe-bootstrap.vlan')
|
92
|
+
expect(result.stderr).to match(/Could not find a certificate/)
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 and 2015.3 shared
|
2
|
+
# the same installation workflow.
|
1
3
|
def set_resources box, max_ram=512, max_cpu=1
|
2
4
|
box.vm.provider :virtualbox do |vb|
|
3
5
|
vb.customize ["modifyvm", :id, "--cpus", max_cpu]
|
@@ -8,63 +10,34 @@ end
|
|
8
10
|
Vagrant.configure('2') do |config|
|
9
11
|
config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
|
10
12
|
|
11
|
-
config.vm.define 'pe-
|
12
|
-
node.vm.hostname = 'pe-
|
13
|
+
config.vm.define 'pe-20161-master' do |node|
|
14
|
+
node.vm.hostname = 'pe-20161-master.pe-bootstrap.vlan'
|
13
15
|
node.vm.box = 'centos'
|
14
16
|
# All-in-one master nodes need a generous amount of RAM for all the Java.
|
15
17
|
set_resources node, 4096, 1
|
16
18
|
node.vm.provision :shell, :inline => 'service iptables stop'
|
17
19
|
|
18
20
|
node.vm.network 'private_network', :ip => '10.20.1.100'
|
19
|
-
node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-
|
21
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20161-agent.pe-bootstrap.vlan" >> /etc/hosts'
|
20
22
|
|
21
23
|
node.vm.provision :pe_bootstrap do |p|
|
22
|
-
p.version = '
|
24
|
+
p.version = '2016.1.2'
|
23
25
|
p.role = :master
|
24
26
|
# Set autosign to false so that we can test pe_agent functionality.
|
25
27
|
p.autosign = false
|
26
28
|
end
|
27
29
|
end
|
28
30
|
|
29
|
-
config.vm.define 'pe-
|
30
|
-
node.vm.hostname = 'pe-
|
31
|
+
config.vm.define 'pe-20161-agent' do |node|
|
32
|
+
node.vm.hostname = 'pe-20161-agent.pe-bootstrap.vlan'
|
31
33
|
node.vm.box = 'ubuntu'
|
32
34
|
|
33
35
|
node.vm.network 'private_network', :ip => '10.20.1.101'
|
34
|
-
node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-
|
36
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-20161-master.pe-bootstrap.vlan" >> /etc/hosts'
|
35
37
|
|
36
38
|
node.vm.provision :pe_agent do |p|
|
37
|
-
p.master_vm = 'pe-
|
39
|
+
p.master_vm = 'pe-20161-master'
|
38
40
|
end
|
39
41
|
end
|
40
42
|
|
41
|
-
config.vm.define 'pe-2015latest-master' do |node|
|
42
|
-
node.vm.hostname = 'pe-2015latest-master.pe-bootstrap.vlan'
|
43
|
-
node.vm.box = 'centos'
|
44
|
-
# All-in-one master nodes need a generous amount of RAM for all the Java.
|
45
|
-
set_resources node, 4096, 1
|
46
|
-
node.vm.provision :shell, :inline => 'service iptables stop'
|
47
|
-
|
48
|
-
node.vm.network 'private_network', :ip => '10.20.1.102'
|
49
|
-
node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
|
50
|
-
|
51
|
-
node.vm.provision :pe_bootstrap do |p|
|
52
|
-
p.version_file = 'LATEST'
|
53
|
-
p.role = :master
|
54
|
-
# Set autosign to false so that we can test pe_agent functionality.
|
55
|
-
p.autosign = false
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
|
-
config.vm.define 'pe-2015latest-agent' do |node|
|
60
|
-
node.vm.hostname = 'pe-2015latest-agent.pe-bootstrap.vlan'
|
61
|
-
node.vm.box = 'ubuntu'
|
62
|
-
|
63
|
-
node.vm.network 'private_network', :ip => '10.20.1.103'
|
64
|
-
node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
|
65
|
-
|
66
|
-
node.vm.provision :pe_agent do |p|
|
67
|
-
p.master_vm = 'pe-2015latest-master'
|
68
|
-
end
|
69
|
-
end
|
70
43
|
end
|
@@ -0,0 +1,72 @@
|
|
1
|
+
# NOTE: This acceptance suite starts off at 2016.2.0 as the installation
|
2
|
+
# workflow changed in that release.
|
3
|
+
def set_resources box, max_ram=512, max_cpu=1
|
4
|
+
box.vm.provider :virtualbox do |vb|
|
5
|
+
vb.customize ["modifyvm", :id, "--cpus", max_cpu]
|
6
|
+
vb.customize ["modifyvm", :id, "--memory", max_ram]
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
Vagrant.configure('2') do |config|
|
11
|
+
config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
|
12
|
+
|
13
|
+
config.vm.define 'pe-20162-master' do |node|
|
14
|
+
node.vm.hostname = 'pe-20162-master.pe-bootstrap.vlan'
|
15
|
+
node.vm.box = 'centos'
|
16
|
+
# All-in-one master nodes need a generous amount of RAM for all the Java.
|
17
|
+
set_resources node, 4096, 1
|
18
|
+
node.vm.provision :shell, :inline => 'service iptables stop'
|
19
|
+
|
20
|
+
node.vm.network 'private_network', :ip => '10.20.1.102'
|
21
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-20162-agent.pe-bootstrap.vlan" >> /etc/hosts'
|
22
|
+
|
23
|
+
node.vm.provision :pe_bootstrap do |p|
|
24
|
+
p.version = '2016.2.0'
|
25
|
+
p.role = :master
|
26
|
+
# Set autosign to false so that we can test pe_agent functionality.
|
27
|
+
p.autosign = false
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
config.vm.define 'pe-20162-agent' do |node|
|
32
|
+
node.vm.hostname = 'pe-20162-agent.pe-bootstrap.vlan'
|
33
|
+
node.vm.box = 'ubuntu'
|
34
|
+
|
35
|
+
node.vm.network 'private_network', :ip => '10.20.1.103'
|
36
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-20162-master.pe-bootstrap.vlan" >> /etc/hosts'
|
37
|
+
|
38
|
+
node.vm.provision :pe_agent do |p|
|
39
|
+
p.master_vm = 'pe-20162-master'
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
config.vm.define 'pe-2016latest-master' do |node|
|
44
|
+
node.vm.hostname = 'pe-2016latest-master.pe-bootstrap.vlan'
|
45
|
+
node.vm.box = 'centos'
|
46
|
+
# All-in-one master nodes need a generous amount of RAM for all the Java.
|
47
|
+
set_resources node, 4096, 1
|
48
|
+
node.vm.provision :shell, :inline => 'service iptables stop'
|
49
|
+
|
50
|
+
node.vm.network 'private_network', :ip => '10.20.1.104'
|
51
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-2016latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
|
52
|
+
|
53
|
+
node.vm.provision :pe_bootstrap do |p|
|
54
|
+
p.version_file = 'LATEST'
|
55
|
+
p.role = :master
|
56
|
+
# Set autosign to false so that we can test pe_agent functionality.
|
57
|
+
p.autosign = false
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
config.vm.define 'pe-2016latest-agent' do |node|
|
62
|
+
node.vm.hostname = 'pe-2016latest-agent.pe-bootstrap.vlan'
|
63
|
+
node.vm.box = 'ubuntu'
|
64
|
+
|
65
|
+
node.vm.network 'private_network', :ip => '10.20.1.105'
|
66
|
+
node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-2016latest-master.pe-bootstrap.vlan" >> /etc/hosts'
|
67
|
+
|
68
|
+
node.vm.provision :pe_agent do |p|
|
69
|
+
p.master_vm = 'pe-2016latest-master'
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
@@ -16,7 +16,7 @@ Vagrant.configure('2') do |config|
|
|
16
16
|
set_resources node, 4096, 1
|
17
17
|
|
18
18
|
node.vm.provision :pe_bootstrap do |p|
|
19
|
-
p.version = '3.8.
|
19
|
+
p.version = '3.8.5'
|
20
20
|
p.role = :master
|
21
21
|
end
|
22
22
|
end
|
@@ -27,7 +27,7 @@ Vagrant.configure('2') do |config|
|
|
27
27
|
set_resources node, 4096, 1
|
28
28
|
|
29
29
|
node.vm.provision :pe_bootstrap do |p|
|
30
|
-
p.version_file = '
|
30
|
+
p.version_file = 'LATEST_3x'
|
31
31
|
p.role = :master
|
32
32
|
end
|
33
33
|
end
|
@@ -16,33 +16,8 @@ class PEBuild::Cap::RunInstall::POSIX
|
|
16
16
|
# @return [void]
|
17
17
|
def self.run_install(machine, installer_path, answers, **options)
|
18
18
|
if options.fetch(:use_pem, false)
|
19
|
-
# NOTE: Ensure symlinks exist since minitar doesn't create them. This
|
20
|
-
# call will be reverted once the PEM changes are finalized.
|
21
|
-
on_machine(machine, <<-EOS)
|
22
|
-
pushd #{File.dirname(installer_path)} > /dev/null
|
23
|
-
if [ -d pe-manager ]
|
24
|
-
then
|
25
|
-
pushd pe-manager > /dev/null
|
26
|
-
ln -sf ../VERSION ../modules .
|
27
|
-
pushd packages > /dev/null
|
28
|
-
ln -sf ../../packages/* .
|
29
|
-
fi
|
30
|
-
EOS
|
31
19
|
on_machine(machine, "#{installer_path} -c #{answers}")
|
32
20
|
else
|
33
|
-
# NOTE: Ensure symlinks exist since minitar doesn't create them. This
|
34
|
-
# call will be reverted once the PEM changes are finalized.
|
35
|
-
on_machine(machine, <<-EOS)
|
36
|
-
pushd #{File.dirname(installer_path)} > /dev/null
|
37
|
-
if [ -d legacy ]
|
38
|
-
then
|
39
|
-
pushd legacy > /dev/null
|
40
|
-
for f in $(find . -type f -empty)
|
41
|
-
do
|
42
|
-
ln -sf ../$f $f
|
43
|
-
done
|
44
|
-
fi
|
45
|
-
EOS
|
46
21
|
on_machine(machine, "#{installer_path} -a #{answers}")
|
47
22
|
end
|
48
23
|
|
@@ -193,13 +193,8 @@ module PEBuild
|
|
193
193
|
answers = File.join("#{machine.name}.txt")
|
194
194
|
end
|
195
195
|
|
196
|
-
# Run a PEM install if the PE version is 2016.2.0 or newer
|
197
|
-
|
198
|
-
#
|
199
|
-
# NOTE: The check for the template file ending may be dropped when
|
200
|
-
# 2016.2.0 final builds are shipped.
|
201
|
-
use_pem = (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0) &&
|
202
|
-
File.basename(@answer_template.template, '.erb').end_with?('.conf')
|
196
|
+
# Run a PEM install if the PE version is 2016.2.0 or newer.
|
197
|
+
use_pem = (PEBuild::Util::VersionString.compare(@config.version, '2016.2.0') >= 0)
|
203
198
|
end
|
204
199
|
|
205
200
|
machine.guest.capability('run_install', installer_path, answers, use_pem: use_pem)
|
data/lib/pe_build/release.rb
CHANGED
data/lib/pe_build/version.rb
CHANGED
data/tasks/acceptance.rake
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
namespace :acceptance do
|
2
2
|
ARTIFACT_DIR = File.join('acceptance', 'artifacts')
|
3
3
|
TEST_BOXES = {
|
4
|
-
'centos-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.
|
5
|
-
'ubuntu-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/ubuntu-14.04-x86_64-virtualbox-nocm-1.0.
|
4
|
+
'centos-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/centos-6.6-x86_64-virtualbox-nocm-1.0.3.box',
|
5
|
+
'ubuntu-virtualbox.box' => 'https://s3.amazonaws.com/puppetlabs-vagrantcloud/ubuntu-14.04-x86_64-virtualbox-nocm-1.0.3.box'
|
6
6
|
}
|
7
7
|
|
8
8
|
directory ARTIFACT_DIR
|
@@ -1,14 +1,6 @@
|
|
1
1
|
# Stock all-in-one answers for 2016.2.x and newer
|
2
2
|
"console_admin_password": "puppetlabs"
|
3
|
-
"puppet_enterprise::certificate_authority_host": "%{::trusted.certname}"
|
4
3
|
"puppet_enterprise::puppet_master_host": "%{::trusted.certname}"
|
5
|
-
|
6
|
-
|
7
|
-
"puppet_enterprise::
|
8
|
-
"puppet_enterprise::pcp_broker_host": "%{::trusted.certname}"
|
9
|
-
"puppet_enterprise::mcollective_middleware_hosts": ["%{::trusted.certname}"]
|
10
|
-
"puppet_enterprise::puppetdb_database_password": "1ZIhBXimu65wZtXpvMpj"
|
11
|
-
"puppet_enterprise::classifier_database_password": "mrwelwaywblIGYjpdHAa"
|
12
|
-
"puppet_enterprise::activity_database_password": "HsguT8FOfLgcQ8dpTus9"
|
13
|
-
"puppet_enterprise::rbac_database_password": "qfNllIKXaOYRaGt2ZIKU"
|
14
|
-
"puppet_enterprise::orchestrator_database_password": "kjhasdASDljhfjhkasd"
|
4
|
+
|
5
|
+
# Additional customization
|
6
|
+
"puppet_enterprise::profile::master::check_for_updates": false
|
@@ -13,7 +13,7 @@ Vagrant::Spec::Acceptance.configure do |c|
|
|
13
13
|
boxes: Dir[acceptance_dir + 'artifacts' + '*-virtualbox.box'],
|
14
14
|
# This folder should be filled with PE tarballs for CentOS.
|
15
15
|
archive_path: (acceptance_dir + 'artifacts' + 'pe_archives').to_s,
|
16
|
-
pe_latest: '
|
16
|
+
pe_latest: '2016.2.0',
|
17
17
|
env_vars: {
|
18
18
|
'VBOX_USER_HOME' => '{{homedir}}',
|
19
19
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-pe_build
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.15.
|
4
|
+
version: 0.15.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Adrien Thebo
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-
|
12
|
+
date: 2016-06-21 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: progressbar
|
@@ -85,10 +85,12 @@ files:
|
|
85
85
|
- README.markdown
|
86
86
|
- Rakefile
|
87
87
|
- acceptance/pe_build/pe_bootstrap_2015x_spec.rb
|
88
|
+
- acceptance/pe_build/pe_bootstrap_2016x_spec.rb
|
88
89
|
- acceptance/pe_build/pe_bootstrap_3x_spec.rb
|
89
90
|
- acceptance/pe_build/pe_bootstrap_latest_spec.rb
|
90
91
|
- acceptance/pe_build/pe_build_cli_spec.rb
|
91
92
|
- acceptance/skeletons/2015x_acceptance/Vagrantfile
|
93
|
+
- acceptance/skeletons/2016x_acceptance/Vagrantfile
|
92
94
|
- acceptance/skeletons/pe_build/Vagrantfile
|
93
95
|
- doc/answers/README.markdown
|
94
96
|
- doc/answers/agent.txt
|