beaker 1.17.5 → 1.17.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/HISTORY.md +36 -2
- data/lib/beaker/dsl/helpers.rb +4 -4
- data/lib/beaker/host/unix.rb +2 -2
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/dsl/ezbake_utils_spec.rb +3 -3
- data/spec/beaker/dsl/helpers_spec.rb +10 -10
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZGUzNGM5MDk4YjUyYzdkMGU1MGI0YzA0YjEwYzA3MWMxNzg2MTc0OA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YTQ5MjMyYWM1OGQ4MjU4NmYxMDYyNDQxYzMyMzIyZjZkNzI2MGEwOA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MzQ3ZTIwZWFhNTgzZjI0NTgyOWNjYTk5NGEzZDllYzM0YTIxYmIzNTFmMDE1
|
10
|
+
ZGIzYWE5MWVmMTg2ZmZjOTQ5MGM2YzFhNjEwYWVmZmIzZDRmNjFhZjYwYTIw
|
11
|
+
ODA1OWMwNGE0YzE3ZGYyYmYwZGU5NzU4YjMxNjkxZGJlNmQ5MTU=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZTFlODFhZjM0NTI2N2JiYzZiZjc0ZmY2YjkwYTc2NjNjODJjODliMmFmMGE1
|
14
|
+
ZWQyOGJjZGI0YzQzMjA5YTNiYzBiMWVhYjc4Njg4NTk0Nzg4NWJkMDY2Y2Qw
|
15
|
+
NmI3MzdiMzI3ODM0MTU2Mzc5YWNjYjU3YTQxMmE4MTE1NzgzMzc=
|
data/HISTORY.md
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# beaker - History
|
2
2
|
## Tags
|
3
|
-
* [LATEST -
|
3
|
+
* [LATEST - 27 Aug, 2014 (71be2050)](#LATEST)
|
4
|
+
* [beaker1.17.5 - 22 Aug, 2014 (7e553089)](#beaker1.17.5)
|
4
5
|
* [beaker1.17.4 - 21 Aug, 2014 (8e6d070f)](#beaker1.17.4)
|
5
6
|
* [beaker1.17.3 - 20 Aug, 2014 (f8a536c1)](#beaker1.17.3)
|
6
7
|
* [beaker1.17.2 - 15 Aug, 2014 (c6f1f64a)](#beaker1.17.2)
|
@@ -57,7 +58,40 @@
|
|
57
58
|
* [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
|
58
59
|
|
59
60
|
## Details
|
60
|
-
### <a name = "LATEST">LATEST -
|
61
|
+
### <a name = "LATEST">LATEST - 27 Aug, 2014 (71be2050)
|
62
|
+
|
63
|
+
* (GEM) version bump for 1.17.6 gem (71be2050)
|
64
|
+
|
65
|
+
* Merge pull request #438 from waynr/fix/qeng-1134-remove-jvm-puppet-references (fe77e9b0)
|
66
|
+
|
67
|
+
|
68
|
+
```
|
69
|
+
Merge pull request #438 from waynr/fix/qeng-1134-remove-jvm-puppet-references
|
70
|
+
|
71
|
+
(QENG-1134) Remove 'jvm-puppet' references left in Beaker.
|
72
|
+
```
|
73
|
+
* (QENG-1134) Remove 'jvm-puppet' references left in Beaker. (5da4eebc)
|
74
|
+
|
75
|
+
|
76
|
+
```
|
77
|
+
(QENG-1134) Remove 'jvm-puppet' references left in Beaker.
|
78
|
+
|
79
|
+
Recently the `jvm-puppet` name was changed to `puppet-server`, this patch
|
80
|
+
addresses that in both `lib/` and `spec/`
|
81
|
+
|
82
|
+
Signed-off-by: Wayne <wayne@puppetlabs.com>
|
83
|
+
```
|
84
|
+
### <a name = "beaker1.17.5">beaker1.17.5 - 22 Aug, 2014 (7e553089)
|
85
|
+
|
86
|
+
* Merge pull request #417 from anodelman/make-gem (7e553089)
|
87
|
+
|
88
|
+
|
89
|
+
```
|
90
|
+
Merge pull request #417 from anodelman/make-gem
|
91
|
+
|
92
|
+
create beaker 1.17.5 gem
|
93
|
+
```
|
94
|
+
* (HISTORY) update history for beaker 1.17.5 gem (ebefea72)
|
61
95
|
|
62
96
|
* (GEM) version bump for beaker 1.17.5 gem (4a96b147)
|
63
97
|
|
data/lib/beaker/dsl/helpers.rb
CHANGED
@@ -571,7 +571,7 @@ module Beaker
|
|
571
571
|
curl_retries = host['master-start-curl-retries'] || options['master-start-curl-retries']
|
572
572
|
logger.debug "Setting curl retries to #{curl_retries}"
|
573
573
|
|
574
|
-
if options[:
|
574
|
+
if options[:is_puppetserver]
|
575
575
|
confdir = host.puppet('master')['confdir']
|
576
576
|
vardir = host.puppet('master')['vardir']
|
577
577
|
|
@@ -588,13 +588,13 @@ module Beaker
|
|
588
588
|
end
|
589
589
|
end
|
590
590
|
|
591
|
-
|
591
|
+
puppetserver_opts = { "jruby-puppet" => {
|
592
592
|
"master-conf-dir" => confdir,
|
593
593
|
"master-var-dir" => vardir,
|
594
594
|
}}
|
595
595
|
|
596
|
-
|
597
|
-
modify_tk_config(host,
|
596
|
+
puppetserver_conf = File.join("#{host['puppetserver-confdir']}", "puppetserver.conf")
|
597
|
+
modify_tk_config(host, puppetserver_conf, puppetserver_opts)
|
598
598
|
end
|
599
599
|
|
600
600
|
begin
|
data/lib/beaker/host/unix.rb
CHANGED
@@ -19,7 +19,7 @@ module Unix
|
|
19
19
|
h.merge({
|
20
20
|
'user' => 'root',
|
21
21
|
'group' => 'pe-puppet',
|
22
|
-
'
|
22
|
+
'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
|
23
23
|
'puppetservice' => 'pe-httpd',
|
24
24
|
'puppetpath' => '/etc/puppetlabs/puppet',
|
25
25
|
'puppetbin' => '/opt/puppet/bin/puppet',
|
@@ -39,7 +39,7 @@ module Unix
|
|
39
39
|
h.merge({
|
40
40
|
'user' => 'root',
|
41
41
|
'group' => 'puppet',
|
42
|
-
'
|
42
|
+
'puppetserver-confdir' => '/etc/puppetserver/conf.d',
|
43
43
|
'puppetservice' => 'puppetmaster',
|
44
44
|
'puppetpath' => '/etc/puppet',
|
45
45
|
'puppetvardir' => '/var/lib/puppet',
|
data/lib/beaker/version.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
EZBAKE_CONFIG_EXAMPLE= {
|
4
|
-
:project => '
|
5
|
-
:real_name => '
|
4
|
+
:project => 'puppetserver',
|
5
|
+
:real_name => 'puppetserver',
|
6
6
|
:user => 'puppet',
|
7
7
|
:group => 'puppet',
|
8
|
-
:uberjar_name => '
|
8
|
+
:uberjar_name => 'puppetserver-release.jar',
|
9
9
|
:config_files => [],
|
10
10
|
:terminus_info => {},
|
11
11
|
:debian => { :additional_dependencies => ["puppet (= 3.6.1-puppetlabs1)"], },
|
@@ -853,7 +853,7 @@ describe ClassMixedWithDSLHelpers do
|
|
853
853
|
}.to raise_error(RuntimeError, /puppet conf backup failed/)
|
854
854
|
end
|
855
855
|
|
856
|
-
describe 'with
|
856
|
+
describe 'with puppet-server' do
|
857
857
|
let(:default_confdir) { "/etc/puppet" }
|
858
858
|
let(:default_vardir) { "/var/lib/puppet" }
|
859
859
|
|
@@ -862,19 +862,19 @@ describe ClassMixedWithDSLHelpers do
|
|
862
862
|
|
863
863
|
let(:command_line_args) {"--vardir=#{custom_vardir} --confdir=#{custom_confdir}"}
|
864
864
|
let(:conf_opts) { {:__commandline_args__ => command_line_args,
|
865
|
-
:
|
865
|
+
:is_puppetserver => true}}
|
866
866
|
|
867
|
-
let(:
|
867
|
+
let(:default_puppetserver_opts) {{ "jruby-puppet" => {
|
868
868
|
"master-conf-dir" => default_confdir,
|
869
869
|
"master-var-dir" => default_vardir,
|
870
870
|
}}}
|
871
871
|
|
872
|
-
let(:
|
872
|
+
let(:custom_puppetserver_opts) {{ "jruby-puppet" => {
|
873
873
|
"master-conf-dir" => custom_confdir,
|
874
874
|
"master-var-dir" => custom_vardir,
|
875
875
|
}}}
|
876
876
|
|
877
|
-
let(:
|
877
|
+
let(:puppetserver_conf) { "/etc/puppetserver/conf.d/puppetserver.conf" }
|
878
878
|
let(:logger) { double }
|
879
879
|
|
880
880
|
def stub_post_setup
|
@@ -893,7 +893,7 @@ describe ClassMixedWithDSLHelpers do
|
|
893
893
|
|
894
894
|
before do
|
895
895
|
stub_post_setup
|
896
|
-
subject.stub( :options) .and_return( {:
|
896
|
+
subject.stub( :options) .and_return( {:is_puppetserver => true})
|
897
897
|
subject.stub( :modify_tk_config)
|
898
898
|
host.stub(:puppet).with('master') .and_return({'confdir' => default_confdir,
|
899
899
|
'vardir' => default_vardir})
|
@@ -901,8 +901,8 @@ describe ClassMixedWithDSLHelpers do
|
|
901
901
|
|
902
902
|
describe 'and command line args passed' do
|
903
903
|
it 'modifies SUT trapperkeeper configuration w/ command line args' do
|
904
|
-
subject.should_receive( :modify_tk_config).with(host,
|
905
|
-
|
904
|
+
subject.should_receive( :modify_tk_config).with(host, puppetserver_conf,
|
905
|
+
custom_puppetserver_opts)
|
906
906
|
subject.with_puppet_running_on(host, conf_opts)
|
907
907
|
end
|
908
908
|
end
|
@@ -910,8 +910,8 @@ describe ClassMixedWithDSLHelpers do
|
|
910
910
|
describe 'and no command line args passed' do
|
911
911
|
let(:command_line_args) { nil }
|
912
912
|
it 'modifies SUT trapperkeeper configuration w/ puppet defaults' do
|
913
|
-
subject.should_receive( :modify_tk_config).with(host,
|
914
|
-
|
913
|
+
subject.should_receive( :modify_tk_config).with(host, puppetserver_conf,
|
914
|
+
default_puppetserver_opts)
|
915
915
|
subject.with_puppet_running_on(host, conf_opts)
|
916
916
|
end
|
917
917
|
end
|
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.17.
|
4
|
+
version: 1.17.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppetlabs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: minitest
|