beaker 1.0.1.pre → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/beaker.gemspec +1 -1
- data/lib/beaker/answers.rb +6 -2
- data/lib/beaker/answers/version32.rb +20 -0
- data/spec/beaker/answers_spec.rb +22 -0
- metadata +5 -4
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MTM0OWZkNGIzNmYyNDhhMjI4Zjk1ODE4M2I5OGZiMTIyMTJlYmJlNg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MGM1MWNkMDNiMWE1ZWNiNTMzNjE2MTg1MDNjYWRjNzRiMDQ2ZmRjZg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NWVkM2ExMzE4MjQzOWQ3MDViZThkMjUzNmFhOWRlMmQ0MTljNzNmY2JlMTkw
|
10
|
+
MWQ2NjQxNGUyMmUwYmZiNGQ0MzhmYTdjMzA1ODg2ZGQ4OThiOGVmOTMwZGEx
|
11
|
+
ZjAyM2E2NjhiODJhZDYyOTI1MjMxMzc0NjhlYjNkYWMxYmRiNmQ=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
OGJlNjgxYzk0ZmE1NTQ0MjIxZDVkMDhiMmRlN2ExMTc1ZGYwZDVmODU4MThk
|
14
|
+
MTA4MjRkNzFlYjIzNzhmMjhlMTNhMmExMzAxYWFjYzg0NWJkZmI5YmJiZTY3
|
15
|
+
YjMxYmI3ZWVkOTM2ZjY3Y2JjYmU4ODViYTJmODA2NGVhZTkxZDY=
|
data/beaker.gemspec
CHANGED
data/lib/beaker/answers.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
[ 'version30', 'version28', 'version20' ].each do |file|
|
1
|
+
[ 'version32', 'version30', 'version28', 'version20' ].each do |file|
|
2
2
|
begin
|
3
3
|
require "beaker/answers/#{file}"
|
4
4
|
rescue LoadError
|
@@ -25,7 +25,11 @@ module Beaker
|
|
25
25
|
def self.answers(version, hosts, master_certname, options)
|
26
26
|
|
27
27
|
case version
|
28
|
-
when /\A3\.
|
28
|
+
when /\A3\.2/
|
29
|
+
Version32.answers(hosts, master_certname, options)
|
30
|
+
when /\A3\.1/
|
31
|
+
Version30.answers(hosts, master_certname, options)
|
32
|
+
when /\A3\.0/
|
29
33
|
Version30.answers(hosts, master_certname, options)
|
30
34
|
when /\A2\.8/
|
31
35
|
Version28.answers(hosts, master_certname, options)
|
@@ -0,0 +1,20 @@
|
|
1
|
+
require 'beaker/answers/version30'
|
2
|
+
|
3
|
+
module Beaker
|
4
|
+
module Answers
|
5
|
+
module Version32
|
6
|
+
def self.answers(hosts, master_certname, options)
|
7
|
+
dashboard = only_host_with_role(hosts, 'dashboard')
|
8
|
+
master = only_host_with_role(hosts, 'master')
|
9
|
+
|
10
|
+
the_answers = Version30.answers(hosts, master_certname, options)
|
11
|
+
if dashboard != master
|
12
|
+
# in 3.2, dashboard needs the master certname
|
13
|
+
the_answers[dashboard.name][:q_puppetmaster_certname] = master_certname
|
14
|
+
end
|
15
|
+
|
16
|
+
return the_answers
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
data/spec/beaker/answers_spec.rb
CHANGED
@@ -8,6 +8,12 @@ module Beaker
|
|
8
8
|
basic_hosts }
|
9
9
|
let( :master_certname ) { 'master_certname' }
|
10
10
|
|
11
|
+
it 'generates 3.2 answers for 3.2 hosts' do
|
12
|
+
@ver = '3.2'
|
13
|
+
Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
|
14
|
+
subject.answers( @ver, hosts, master_certname, {} )
|
15
|
+
end
|
16
|
+
|
11
17
|
it 'generates 3.0 answers for 3.1 hosts' do
|
12
18
|
@ver = '3.1'
|
13
19
|
Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, {} ).once
|
@@ -39,6 +45,22 @@ module Beaker
|
|
39
45
|
end
|
40
46
|
|
41
47
|
module Answers
|
48
|
+
describe Version32 do
|
49
|
+
let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
|
50
|
+
let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
|
51
|
+
basic_hosts[1]['roles'] = ['dashboard', 'agent']
|
52
|
+
basic_hosts[2]['roles'] = ['database', 'agent']
|
53
|
+
basic_hosts }
|
54
|
+
let( :master_certname ) { 'master_certname' }
|
55
|
+
|
56
|
+
# The only difference between 3.2 and 3.0 is the addition of the
|
57
|
+
# master certname to the dashboard answers
|
58
|
+
it 'should add q_puppetmaster_certname to the dashboard answers' do
|
59
|
+
@ver = '3.2'
|
60
|
+
expect( subject.answers( hosts, master_certname, {} )['vm2']).to include :q_puppetmaster_certname
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
42
64
|
describe Version30 do
|
43
65
|
let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
|
44
66
|
let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.1
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppetlabs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-11-
|
11
|
+
date: 2013-11-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -272,6 +272,7 @@ files:
|
|
272
272
|
- lib/beaker/answers/version20.rb
|
273
273
|
- lib/beaker/answers/version28.rb
|
274
274
|
- lib/beaker/answers/version30.rb
|
275
|
+
- lib/beaker/answers/version32.rb
|
275
276
|
- lib/beaker/cli.rb
|
276
277
|
- lib/beaker/command.rb
|
277
278
|
- lib/beaker/command_factory.rb
|
@@ -401,9 +402,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
401
402
|
version: '0'
|
402
403
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
403
404
|
requirements:
|
404
|
-
- - ! '
|
405
|
+
- - ! '>='
|
405
406
|
- !ruby/object:Gem::Version
|
406
|
-
version:
|
407
|
+
version: '0'
|
407
408
|
requirements: []
|
408
409
|
rubyforge_project:
|
409
410
|
rubygems_version: 2.0.6
|