beaker 2.18.0 → 2.18.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/HISTORY.md +49 -2
- data/lib/beaker/dsl/install_utils/aio_defaults.rb +0 -1
- data/lib/beaker/dsl/install_utils/foss_utils.rb +6 -1
- data/lib/beaker/dsl/install_utils/pe_defaults.rb +7 -7
- data/lib/beaker/dsl/install_utils/pe_utils.rb +2 -0
- data/lib/beaker/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MDk4YmZiMzQwNWUxOTczZGZjMmYwYTBhNzQ1NWQyODc3NDlhZGYzMg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZmU3YjQ2ZjhmNjM3ODBjZjIwYTI3YTQ2ODRjY2U1ZTgyNjlmNTY3ZA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MzYzNzNjNTIxMTkzNTI3ZGQxZDQ3ODBjZjc4ZmQwNGNiOTdhYjE0NzlkYjk1
|
10
|
+
YTdjZjk3NDRiMGU3MWQzZGIxMjg2MmFhNjcwZDQ0ZjBlYWZhOTk5OTJkN2Vk
|
11
|
+
ODEzNmUxZTZlYjNmNTI2MzZmYzY0ZDNjZGQ1ZjBjMWE1NjJmMzY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
OGEwNDc5MjlhMDIzMGJhMThjZDk4ZTI4NmI3MTE5NDk5ZjU0ODE2ODg1OTFk
|
14
|
+
YTE1ODVkNTkzMWQ2OGU5OWI4M2E4MDhlNzA2ZDc2Mzc1MGI3YTc2MGNkMmU1
|
15
|
+
YWEyNjBiZDA3ZmY0OTI3MzAyOWFkN2IyOTNhMDk4ZGI3ZDVjN2U=
|
data/HISTORY.md
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# default - History
|
2
2
|
## Tags
|
3
|
-
* [LATEST -
|
3
|
+
* [LATEST - 14 Jul, 2015 (f9939536)](#LATEST)
|
4
|
+
* [2.18.0 - 13 Jul, 2015 (e018f2fc)](#2.18.0)
|
4
5
|
* [2.17.0 - 10 Jul, 2015 (aaac4771)](#2.17.0)
|
5
6
|
* [2.16.0 - 6 Jul, 2015 (b3e76227)](#2.16.0)
|
6
7
|
* [2.15.1 - 1 Jul, 2015 (cd6f0bab)](#2.15.1)
|
@@ -87,7 +88,53 @@
|
|
87
88
|
* [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
|
88
89
|
|
89
90
|
## Details
|
90
|
-
### <a name = "LATEST">LATEST -
|
91
|
+
### <a name = "LATEST">LATEST - 14 Jul, 2015 (f9939536)
|
92
|
+
|
93
|
+
* (GEM) update beaker version to 2.18.1 (f9939536)
|
94
|
+
|
95
|
+
* Merge pull request #891 from anodelman/shallow (c4b30018)
|
96
|
+
|
97
|
+
|
98
|
+
```
|
99
|
+
Merge pull request #891 from anodelman/shallow
|
100
|
+
|
101
|
+
(BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage
|
102
|
+
```
|
103
|
+
* Merge pull request #890 from justinstoller/bug/master/BKR-403_sless (e52b0af4)
|
104
|
+
|
105
|
+
|
106
|
+
```
|
107
|
+
Merge pull request #890 from justinstoller/bug/master/BKR-403_sless
|
108
|
+
|
109
|
+
(BKR-403) Use rpm on sles for pe puppet-agent
|
110
|
+
```
|
111
|
+
* (BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage (8c262979)
|
112
|
+
|
113
|
+
|
114
|
+
```
|
115
|
+
(BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage
|
116
|
+
|
117
|
+
- provide a sane default for puppetservice for aio defaults, but allow
|
118
|
+
override with a user setting
|
119
|
+
```
|
120
|
+
* (BKR-403) Use rpm on sles for pe puppet-agent (6acd9938)
|
121
|
+
|
122
|
+
|
123
|
+
```
|
124
|
+
(BKR-403) Use rpm on sles for pe puppet-agent
|
125
|
+
|
126
|
+
In BKR-397 we updated rpm using platforms to use yum instead of rpm in
|
127
|
+
the install_puppet_agent_pe_promoted_repo, however it wasn't noticed
|
128
|
+
that SLES was also an rpm using platform in the match that doesn't also
|
129
|
+
include yum.
|
130
|
+
|
131
|
+
This patch moves SLES platforms into their own branch of logic that uses
|
132
|
+
the old rpm installation method while retaining the yum based
|
133
|
+
installation for other platforms.
|
134
|
+
```
|
135
|
+
### <a name = "2.18.0">2.18.0 - 13 Jul, 2015 (e018f2fc)
|
136
|
+
|
137
|
+
* (HISTORY) update beaker history for gem release 2.18.0 (e018f2fc)
|
91
138
|
|
92
139
|
* (GEM) update beaker version to 2.18.0 (268ce21e)
|
93
140
|
|
@@ -39,6 +39,8 @@ module Beaker
|
|
39
39
|
or (host['type'] && host['type'] =~ /aio/)
|
40
40
|
# add aio defaults to host
|
41
41
|
add_aio_defaults_on(host)
|
42
|
+
# provide a sane default here for puppetservice
|
43
|
+
host['puppetservice'] ||= 'puppetserver'
|
42
44
|
else
|
43
45
|
add_foss_defaults_on(host)
|
44
46
|
end
|
@@ -1141,9 +1143,12 @@ module Beaker
|
|
1141
1143
|
scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
|
1142
1144
|
|
1143
1145
|
case variant
|
1144
|
-
when /^(fedora|el|centos
|
1146
|
+
when /^(fedora|el|centos)$/
|
1145
1147
|
on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
|
1146
1148
|
on host, "yum --nogpgcheck localinstall -y #{onhost_copied_file}"
|
1149
|
+
when /^(sles)$/
|
1150
|
+
on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
|
1151
|
+
on host, "rpm -ihv #{onhost_copied_file}"
|
1147
1152
|
when /^(debian|ubuntu|cumulus)$/
|
1148
1153
|
on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
|
1149
1154
|
on host, "dpkg -i --force-all #{onhost_copied_file}"
|
@@ -11,7 +11,7 @@ module Beaker
|
|
11
11
|
PE_DEFAULTS = {
|
12
12
|
'mac' => {
|
13
13
|
'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
|
14
|
-
'puppetservice' => 'pe-
|
14
|
+
'puppetservice' => 'pe-puppetserver',
|
15
15
|
'puppetpath' => '/etc/puppetlabs/puppet',
|
16
16
|
'puppetconfdir' => '/etc/puppetlabs/puppet',
|
17
17
|
'puppetcodedir' => '/etc/puppetlabs/puppet',
|
@@ -26,7 +26,7 @@ module Beaker
|
|
26
26
|
},
|
27
27
|
'unix' => {
|
28
28
|
'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
|
29
|
-
'puppetservice' => 'pe-
|
29
|
+
'puppetservice' => 'pe-puppetserver',
|
30
30
|
'puppetpath' => '/etc/puppetlabs/puppet',
|
31
31
|
'puppetconfdir' => '/etc/puppetlabs/puppet',
|
32
32
|
'puppetbin' => '/opt/puppet/bin/puppet',
|
@@ -40,7 +40,7 @@ module Beaker
|
|
40
40
|
'sitemoduledir' => '/opt/puppet/share/puppet/modules',
|
41
41
|
},
|
42
42
|
'windows' => { #cygwin windows
|
43
|
-
'puppetservice' => 'pe-
|
43
|
+
'puppetservice' => 'pe-puppetserver',
|
44
44
|
'puppetpath' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
|
45
45
|
'puppetconfdir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
|
46
46
|
'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
|
@@ -53,7 +53,7 @@ module Beaker
|
|
53
53
|
'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/sys/ruby/bin',
|
54
54
|
},
|
55
55
|
'pswindows' => { #windows windows
|
56
|
-
'puppetservice' => 'pe-
|
56
|
+
'puppetservice' => 'pe-puppetserver',
|
57
57
|
'puppetpath' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
|
58
58
|
'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
|
59
59
|
'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
|
@@ -79,10 +79,10 @@ module Beaker
|
|
79
79
|
host['group'] = 'pe-puppet'
|
80
80
|
end
|
81
81
|
host['type'] = 'pe'
|
82
|
-
#
|
82
|
+
# older pe requires a different puppetservice name, set it here on the master
|
83
83
|
if host['roles'].include?('master')
|
84
|
-
if host['pe_ver'] and (
|
85
|
-
host['puppetservice'] = 'pe-
|
84
|
+
if host['pe_ver'] and (version_is_less(host['pe_ver'], '3.4'))
|
85
|
+
host['puppetservice'] = 'pe-httpd'
|
86
86
|
end
|
87
87
|
end
|
88
88
|
end
|
@@ -28,6 +28,8 @@ module Beaker
|
|
28
28
|
block_on hosts do |host|
|
29
29
|
if host[:pe_ver] && aio_version?(host) or (host['type'] && host['type'] =~ /aio/)
|
30
30
|
add_aio_defaults_on(host)
|
31
|
+
# provide a sane default here for puppetservice
|
32
|
+
host['puppetservice'] ||= 'pe-puppetserver'
|
31
33
|
else
|
32
34
|
add_pe_defaults_on(host)
|
33
35
|
end
|
data/lib/beaker/version.rb
CHANGED