vagrant-pe_build 0.13.4 → 0.13.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG +9 -0
- data/acceptance/skeletons/2015x_acceptance/Vagrantfile +1 -1
- data/acceptance/skeletons/pe_build/Vagrantfile +1 -1
- data/lib/pe_build/release.rb +2 -1
- data/lib/pe_build/release/2015_3.rb +36 -0
- data/lib/pe_build/version.rb +1 -1
- data/spec/unit/config/pe_agent_spec.rb +10 -8
- 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: 82a0a87cd4f19cd2c7c0996203d47b8728a05e3e
|
4
|
+
data.tar.gz: cbf3b93f342c26e5938a62aa70e9046ecd421e9f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f61e24966a21c5662b9431ade9bfed6bc79b98ed6c2206fe158527b52dc7dcd0edf24c34e0bfa7e58b68b529c18213d5e16027ca43a253fc3fc38431701ff62
|
7
|
+
data.tar.gz: 3d20da4e5a0258566b84862f361d80d46cd6e3558cee10a20827856752e005705195670859bcdb4f58ac365e06e2c8b0f72d557b459fbebba1c3146285a36745
|
data/CHANGELOG
CHANGED
@@ -19,7 +19,7 @@ Vagrant.configure('2') do |config|
|
|
19
19
|
node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20152-agent.pe-bootstrap.vlan" >> /etc/hosts'
|
20
20
|
|
21
21
|
node.vm.provision :pe_bootstrap do |p|
|
22
|
-
p.version = '2015.2.
|
22
|
+
p.version = '2015.2.3'
|
23
23
|
p.role = :master
|
24
24
|
# Set autosign to false so that we can test pe_agent functionality.
|
25
25
|
p.autosign = false
|
data/lib/pe_build/release.rb
CHANGED
@@ -0,0 +1,36 @@
|
|
1
|
+
require 'pe_build/release'
|
2
|
+
|
3
|
+
module PEBuild::Release
|
4
|
+
|
5
|
+
twentyfifteen_three_x = newrelease do
|
6
|
+
|
7
|
+
# PE 2015.2.x supports many more platforms, but the pe_bootstrap
|
8
|
+
# provisioner can only work with tarball installers --- which are now only
|
9
|
+
# available for the following master platforms:
|
10
|
+
add_release :el, '6'
|
11
|
+
add_release :el, '7'
|
12
|
+
|
13
|
+
add_release :sles, '11'
|
14
|
+
add_release :sles, '12'
|
15
|
+
|
16
|
+
add_release :ubuntu, '12.04'
|
17
|
+
add_release :ubuntu, '14.04'
|
18
|
+
|
19
|
+
# Nothing has changed for installation of Windows agents.
|
20
|
+
|
21
|
+
add_release :windows, '2003'
|
22
|
+
add_release :windows, '2003R2'
|
23
|
+
add_release :windows, '2008'
|
24
|
+
add_release :windows, '2008R2'
|
25
|
+
add_release :windows, '7'
|
26
|
+
add_release :windows, '2012'
|
27
|
+
add_release :windows, '2012R2'
|
28
|
+
add_release :windows, '8'
|
29
|
+
add_release :windows, '8.1'
|
30
|
+
|
31
|
+
set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2015.x.txt.erb')
|
32
|
+
set_answer_file :agent, File.join(PEBuild.template_dir, 'answers', 'agent-2015.x.txt.erb')
|
33
|
+
end
|
34
|
+
|
35
|
+
@releases['2015.3.0'] = twentyfifteen_three_x
|
36
|
+
end
|
data/lib/pe_build/version.rb
CHANGED
@@ -9,6 +9,9 @@ describe PEBuild::Config::PEAgent do
|
|
9
9
|
before(:each) do
|
10
10
|
allow(machine).to receive(:env).and_return(env)
|
11
11
|
allow(env).to receive(:machine_names).and_return([:master])
|
12
|
+
|
13
|
+
# Minimum valid configuration.
|
14
|
+
subject.master = 'master.company.com'
|
12
15
|
end
|
13
16
|
|
14
17
|
describe 'autosign' do
|
@@ -35,7 +38,7 @@ describe PEBuild::Config::PEAgent do
|
|
35
38
|
|
36
39
|
errors = subject.validate(machine)
|
37
40
|
|
38
|
-
expect(errors['pe_agent provisioner'].
|
41
|
+
expect(errors['pe_agent provisioner'].join).to match(/Use of the .* setting requires master_vm/)
|
39
42
|
end
|
40
43
|
end
|
41
44
|
end
|
@@ -64,19 +67,20 @@ describe PEBuild::Config::PEAgent do
|
|
64
67
|
|
65
68
|
errors = subject.validate(machine)
|
66
69
|
|
67
|
-
expect(errors['pe_agent provisioner'].
|
70
|
+
expect(errors['pe_agent provisioner'].join).to match(/Use of the .* setting requires master_vm/)
|
68
71
|
end
|
69
72
|
end
|
70
73
|
end
|
71
74
|
|
72
75
|
describe 'master' do
|
73
76
|
it 'must be set if master_vm is nil' do
|
77
|
+
subject.master = nil
|
74
78
|
subject.master_vm = nil
|
75
79
|
subject.finalize!
|
76
80
|
|
77
81
|
errors = subject.validate(machine)
|
78
82
|
|
79
|
-
expect(errors['pe_agent provisioner'].
|
83
|
+
expect(errors['pe_agent provisioner'].join).to match(/No master or master_vm setting has been configured/)
|
80
84
|
end
|
81
85
|
|
82
86
|
it 'may be unset if master_vm is not nil' do
|
@@ -99,13 +103,11 @@ describe PEBuild::Config::PEAgent do
|
|
99
103
|
|
100
104
|
errors = subject.validate(machine)
|
101
105
|
|
102
|
-
expect(errors['pe_agent provisioner'].
|
106
|
+
expect(errors['pe_agent provisioner'].join).to match(/The specified master_vm,.*, is not defined/)
|
103
107
|
end
|
104
108
|
end
|
105
109
|
|
106
110
|
describe 'version' do
|
107
|
-
before(:each) { subject.master = 'master.company.com' }
|
108
|
-
|
109
111
|
it 'defaults to "current"' do
|
110
112
|
subject.finalize!
|
111
113
|
|
@@ -138,7 +140,7 @@ describe PEBuild::Config::PEAgent do
|
|
138
140
|
|
139
141
|
# Casting the array to a string and using a regex matcher gives a nice
|
140
142
|
# diff in the case of failure.
|
141
|
-
expect(errors['pe_agent provisioner'].
|
143
|
+
expect(errors['pe_agent provisioner'].join).to match(/The agent version.*is invalid./)
|
142
144
|
end
|
143
145
|
|
144
146
|
it "may be greater than or equal to #{PEBuild::Config::PEAgent::MINIMUM_VERSION}" do
|
@@ -156,7 +158,7 @@ describe PEBuild::Config::PEAgent do
|
|
156
158
|
subject.finalize!
|
157
159
|
errors = subject.validate(machine)
|
158
160
|
|
159
|
-
expect(errors['pe_agent provisioner'].
|
161
|
+
expect(errors['pe_agent provisioner'].join).to match(/The agent version.*is too old./)
|
160
162
|
end
|
161
163
|
end
|
162
164
|
|
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.13.
|
4
|
+
version: 0.13.5
|
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: 2015-
|
12
|
+
date: 2015-12-08 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: progressbar
|
@@ -144,6 +144,7 @@ files:
|
|
144
144
|
- lib/pe_build/release.rb
|
145
145
|
- lib/pe_build/release/1_2.rb
|
146
146
|
- lib/pe_build/release/2015_2.rb
|
147
|
+
- lib/pe_build/release/2015_3.rb
|
147
148
|
- lib/pe_build/release/2_0.rb
|
148
149
|
- lib/pe_build/release/2_5.rb
|
149
150
|
- lib/pe_build/release/2_6.rb
|
@@ -218,3 +219,4 @@ signing_key:
|
|
218
219
|
specification_version: 4
|
219
220
|
summary: Vagrant provisioners for installing Puppet Enterprise
|
220
221
|
test_files: []
|
222
|
+
has_rdoc:
|