beaker 2.15.1 → 2.16.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/HISTORY.md +238 -2
- data/acceptance/tests/hypervisor/communication.rb +7 -0
- data/lib/beaker/answers/version30.rb +51 -46
- data/lib/beaker/dsl/install_utils/foss_utils.rb +146 -66
- data/lib/beaker/dsl/install_utils/pe_utils.rb +8 -4
- data/lib/beaker/host.rb +18 -12
- data/lib/beaker/host/pswindows/exec.rb +16 -0
- data/lib/beaker/host/unix/exec.rb +16 -0
- data/lib/beaker/host/unix/pkg.rb +2 -0
- data/lib/beaker/host/windows/exec.rb +17 -0
- data/lib/beaker/host_prebuilt_steps.rb +1 -1
- data/lib/beaker/hypervisor/aws_sdk.rb +78 -4
- data/lib/beaker/junit.xsl +27 -1
- data/lib/beaker/options/command_line_parser.rb +6 -0
- data/lib/beaker/options/presets.rb +5 -0
- data/lib/beaker/platform.rb +6 -1
- data/lib/beaker/test_suite.rb +35 -3
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/answers_spec.rb +42 -5
- data/spec/beaker/dsl/install_utils/foss_utils_spec.rb +1 -1
- data/spec/beaker/dsl/install_utils/pe_utils_spec.rb +4 -2
- data/spec/beaker/host_spec.rb +23 -0
- data/spec/beaker/hypervisor/aws_sdk_spec.rb +35 -3
- data/spec/beaker/options/command_line_parser_spec.rb +2 -2
- data/spec/beaker/test_suite_spec.rb +37 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NDFkMzY5NTRmMTYyNWI3NzhhZTBkNDUyZDQwNDE4ZGQ4ZTYzOWE0MA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MmYyODFjZTYzNGM1NmRhYzRiZjNiZDIzMDEzOTdkMmI3ZDI5Y2JiZg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YjAyZTMxYjQ5YTZhOWQwZjM4N2NlYTVjYmEzMDg4MGZjNzgyYTYzNGUwNDk2
|
10
|
+
MDliNmY1NjYzMGY0MDE5YjE1NTc2YjdjZTRkNjk1ZmYyNWJmMzQ0ZDkxNTJh
|
11
|
+
NWMyMjBjYWMzY2I1MzVhYzYyNDQ1ZmI2MDFkOTI0YTEyYTFiNGM=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
Yzc2NWU5OTQ3OWZlNGU2MzhlYTNhM2I0NThmOGU0NWRkZTgwM2EzMTQxYmMz
|
14
|
+
ODQwOTEwYWFiYWEzYzQ5MWJiY2NjZTk2NDRlZjk3YTg1MzFjMDQ0OTViM2Ey
|
15
|
+
YTY0YTdkMTYwMDhhYzFlNjkyM2VlOWRiMzBhOTlmODRhZjVkNWY=
|
data/HISTORY.md
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# default - History
|
2
2
|
## Tags
|
3
|
-
* [LATEST -
|
3
|
+
* [LATEST - 6 Jul, 2015 (6b0a9ca2)](#LATEST)
|
4
|
+
* [2.15.1 - 1 Jul, 2015 (cd6f0bab)](#2.15.1)
|
4
5
|
* [2.15.0 - 1 Jul, 2015 (07c416fb)](#2.15.0)
|
5
6
|
* [2.14.1 - 5 Jun, 2015 (35026603)](#2.14.1)
|
6
7
|
* [2.14.0 - 4 Jun, 2015 (c0ebcd16)](#2.14.0)
|
@@ -84,7 +85,242 @@
|
|
84
85
|
* [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
|
85
86
|
|
86
87
|
## Details
|
87
|
-
### <a name = "LATEST">LATEST -
|
88
|
+
### <a name = "LATEST">LATEST - 6 Jul, 2015 (6b0a9ca2)
|
89
|
+
|
90
|
+
* (GEM) update beaker version to 2.16.0 (6b0a9ca2)
|
91
|
+
|
92
|
+
* Merge pull request #876 from anodelman/shallow (6edc61fe)
|
93
|
+
|
94
|
+
|
95
|
+
```
|
96
|
+
Merge pull request #876 from anodelman/shallow
|
97
|
+
|
98
|
+
(BKR-383) puppet-agent dmg installation doesn't work for anything...
|
99
|
+
```
|
100
|
+
* Merge pull request #877 from anodelman/osx (35d266b0)
|
101
|
+
|
102
|
+
|
103
|
+
```
|
104
|
+
Merge pull request #877 from anodelman/osx
|
105
|
+
|
106
|
+
(BKR-384) & (BKR-385) support for dev puppet-agent installation on osx
|
107
|
+
```
|
108
|
+
* Merge pull request #878 from anodelman/maint (c011ff05)
|
109
|
+
|
110
|
+
|
111
|
+
```
|
112
|
+
Merge pull request #878 from anodelman/maint
|
113
|
+
|
114
|
+
(MAINT) bad hardcoded 'debian' in puppet-agent promoted installation
|
115
|
+
```
|
116
|
+
* Merge pull request #856 from kevpl/bkr336_executiontime_add (fbe5b300)
|
117
|
+
|
118
|
+
|
119
|
+
```
|
120
|
+
Merge pull request #856 from kevpl/bkr336_executiontime_add
|
121
|
+
|
122
|
+
(BKR-336) added command-line arg to get test results in timing order
|
123
|
+
```
|
124
|
+
* (MAINT) bad hardcoded 'debian' in puppet-agent promoted installation (441de9ea)
|
125
|
+
|
126
|
+
|
127
|
+
```
|
128
|
+
(MAINT) bad hardcoded 'debian' in puppet-agent promoted installation
|
129
|
+
|
130
|
+
- should use #{variant} and not hardcoded debian, otherwise pukes on
|
131
|
+
ubuntu
|
132
|
+
```
|
133
|
+
* (BKR-384) install_puppet_agent_dev_repo needs to support osx (9772fcfb)
|
134
|
+
|
135
|
+
|
136
|
+
```
|
137
|
+
(BKR-384) install_puppet_agent_dev_repo needs to support osx
|
138
|
+
|
139
|
+
- able to install dev puppet-agent on osx
|
140
|
+
|
141
|
+
example:
|
142
|
+
|
143
|
+
install_puppet_agent_dev_repo_on(host,
|
144
|
+
{ :puppet_agent_sha => 'c2946821d1bcd7e43a34bd1f9cd2f86160ca4fe0',
|
145
|
+
:puppet_agent_version => '1.2.1.23.gc294682' })
|
146
|
+
```
|
147
|
+
* (BKR-385) beaker needs to be able to convert mac codename to... (dee9b7c6)
|
148
|
+
|
149
|
+
|
150
|
+
```
|
151
|
+
(BKR-385) beaker needs to be able to convert mac codename to...
|
152
|
+
|
153
|
+
...version number
|
154
|
+
|
155
|
+
- add support to the platform object to handle yosemite -> 10.10 and
|
156
|
+
mavericks -> 10.9 conversions for osx variant
|
157
|
+
```
|
158
|
+
* Merge pull request #875 from anodelman/puppet-agent (0a4318a2)
|
159
|
+
|
160
|
+
|
161
|
+
```
|
162
|
+
Merge pull request #875 from anodelman/puppet-agent
|
163
|
+
|
164
|
+
(BKR-377) Installing the Latest Puppet Agent Package
|
165
|
+
```
|
166
|
+
* (BKR-383) puppet-agent dmg installation doesn't work for anything... (6361cd78)
|
167
|
+
|
168
|
+
|
169
|
+
```
|
170
|
+
(BKR-383) puppet-agent dmg installation doesn't work for anything...
|
171
|
+
|
172
|
+
... other than 'latest'
|
173
|
+
|
174
|
+
- fix up the url construction for downloading a release mac puppet-agent
|
175
|
+
- tested locally
|
176
|
+
- there currently is not puppet-agent-latest.dmg file, so that won't
|
177
|
+
work until that is posted
|
178
|
+
```
|
179
|
+
* Merge pull request #861 from logicminds/BKR-365 (c6bcdc9c)
|
180
|
+
|
181
|
+
|
182
|
+
```
|
183
|
+
Merge pull request #861 from logicminds/BKR-365
|
184
|
+
|
185
|
+
BKR-365 - allow beaker to use ssh config with rsync
|
186
|
+
```
|
187
|
+
* Merge pull request #867 from anodelman/hypervisor-acceptance (20e12ca7)
|
188
|
+
|
189
|
+
|
190
|
+
```
|
191
|
+
Merge pull request #867 from anodelman/hypervisor-acceptance
|
192
|
+
|
193
|
+
(BKR-367) create beaker ec2 smoketest
|
194
|
+
```
|
195
|
+
* Merge pull request #866 from kevpl/bkr318_f5_added (2cedf59a)
|
196
|
+
|
197
|
+
|
198
|
+
```
|
199
|
+
Merge pull request #866 from kevpl/bkr318_f5_added
|
200
|
+
|
201
|
+
(BKR-318) added platform support for f5
|
202
|
+
```
|
203
|
+
* Merge pull request #871 from anodelman/answers (66b3d8e1)
|
204
|
+
|
205
|
+
|
206
|
+
```
|
207
|
+
Merge pull request #871 from anodelman/answers
|
208
|
+
|
209
|
+
(BKR-370) beaker doesn't use answers set as env vars
|
210
|
+
```
|
211
|
+
* (BKR-377) Installing the Latest Puppet Agent Package (ffaada1e)
|
212
|
+
|
213
|
+
|
214
|
+
```
|
215
|
+
(BKR-377) Installing the Latest Puppet Agent Package
|
216
|
+
|
217
|
+
- support 'latest' as puppet_agent_version in
|
218
|
+
install_puppet_agent_pe_promoted_on
|
219
|
+
- default to 'latest' for
|
220
|
+
install_puppet_agent_pe_promoted_on::puppet_agent_version
|
221
|
+
```
|
222
|
+
* Merge pull request #873 from anodelman/shallow (a14f1624)
|
223
|
+
|
224
|
+
|
225
|
+
```
|
226
|
+
Merge pull request #873 from anodelman/shallow
|
227
|
+
|
228
|
+
(BKR-376) better interface to install puppet-agent through install_pe
|
229
|
+
```
|
230
|
+
* Merge pull request #874 from anodelman/maint (a0959a20)
|
231
|
+
|
232
|
+
|
233
|
+
```
|
234
|
+
Merge pull request #874 from anodelman/maint
|
235
|
+
|
236
|
+
(BKR-378) RHEL4 runs fail due to the absence of yum
|
237
|
+
```
|
238
|
+
* (BKR-378) RHEL4 runs fail due to the absence of yum (e7276d32)
|
239
|
+
|
240
|
+
|
241
|
+
```
|
242
|
+
(BKR-378) RHEL4 runs fail due to the absence of yum
|
243
|
+
|
244
|
+
- regression: accidentally changed as a ride along to puppet-agent installation
|
245
|
+
work, return to correct state
|
246
|
+
```
|
247
|
+
* (BKR-376) better interface to install puppet-agent through install_pe (bfb9f006)
|
248
|
+
|
249
|
+
|
250
|
+
```
|
251
|
+
(BKR-376) better interface to install puppet-agent through install_pe
|
252
|
+
|
253
|
+
- standardize on parameter names puppet_agent_version, puppet_agent_sha
|
254
|
+
- if no puppet_agent_sha is provided default to puppet_agent_version
|
255
|
+
- support new env vars
|
256
|
+
* BEAKER_PUPPET_AGENT_VERSION
|
257
|
+
* BEAKER_PUPPET_AGENT_SHA
|
258
|
+
* BEAKER_PUPPET_COLLECTION
|
259
|
+
|
260
|
+
- examples (puppet-agent installation):
|
261
|
+
install_puppet_agent_on(host, { :version => '1.1.0', :default_action => 'gem_install'})
|
262
|
+
install_puppet_agent_dev_repo_on(host, { :puppet_agent_sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :puppet_agent_version => '1.1.1.225.gd3
|
263
|
+
377fe' })
|
264
|
+
install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_sha => '1.1.0.227', :puppet_agent_version => '1.1.0.227.g1d8334c', :pe_ver => '4.0
|
265
|
+
.0-rc1'})
|
266
|
+
|
267
|
+
- using install_pe/install_pe_on (for versions of PE > 4.0)
|
268
|
+
set the puppet-agent version through an env var:
|
269
|
+
export BEAKER_PUPPET_AGENT_VERSION=1.2.0
|
270
|
+
can then just call:
|
271
|
+
install_pe or install_pe_on(hosts, options)
|
272
|
+
|
273
|
+
set the puppet-agent version through the options hash
|
274
|
+
options[:puppet_agent_version] = '1.2.0'
|
275
|
+
install_pe
|
276
|
+
```
|
277
|
+
* (BKR-370) beaker doesn't use answers set as env vars (521780ec)
|
278
|
+
|
279
|
+
|
280
|
+
```
|
281
|
+
(BKR-370) beaker doesn't use answers set as env vars
|
282
|
+
|
283
|
+
- not correctly using 'answer_for' to determine if there is a provided
|
284
|
+
value for all questions
|
285
|
+
- fixed up some variable naming for clarity
|
286
|
+
```
|
287
|
+
* (BKR-367) create beaker ec2 smoketest (56aa9438)
|
288
|
+
|
289
|
+
|
290
|
+
```
|
291
|
+
(BKR-367) create beaker ec2 smoketest
|
292
|
+
|
293
|
+
- add acceptance/tests/hypervisor/communication.rb, checks to ensure
|
294
|
+
that hosts can ping each other
|
295
|
+
- enable ping for aws ec2 instances created by beaker
|
296
|
+
- create host.ping method to ping from host to a second host, return
|
297
|
+
'true' when ping is successful, 'false' otherwise
|
298
|
+
```
|
299
|
+
* (BKR-318) added platform support for f5 (308cb672)
|
300
|
+
|
301
|
+
* BKR-365 - allow beaker to use ssh config with rsync (691823fc)
|
302
|
+
|
303
|
+
|
304
|
+
```
|
305
|
+
BKR-365 - allow beaker to use ssh config with rsync
|
306
|
+
|
307
|
+
* fixes a bug that vagrant introduced when using dynamic ssh configs
|
308
|
+
```
|
309
|
+
* (BKR-336) added command-line arg to get test results in timing order (806ff012)
|
310
|
+
|
311
|
+
|
312
|
+
```
|
313
|
+
(BKR-336) added command-line arg to get test results in timing order
|
314
|
+
|
315
|
+
The new argument will allow a second beaker_*.xml file to be
|
316
|
+
created next to the first one in timing order.
|
317
|
+
|
318
|
+
Conflicts:
|
319
|
+
lib/beaker/options/command_line_parser.rb
|
320
|
+
```
|
321
|
+
### <a name = "2.15.1">2.15.1 - 1 Jul, 2015 (cd6f0bab)
|
322
|
+
|
323
|
+
* (HISTORY) update beaker history for gem release 2.15.1 (cd6f0bab)
|
88
324
|
|
89
325
|
* (GEM) update beaker version to 2.15.1 (eb1f373a)
|
90
326
|
|
@@ -19,33 +19,33 @@ module Beaker
|
|
19
19
|
|
20
20
|
# Everything's an agent
|
21
21
|
agent_a = {
|
22
|
-
:q_puppetagent_install => 'y',
|
23
|
-
:q_puppet_cloud_install => 'y',
|
22
|
+
:q_puppetagent_install => answer_for(options, :q_puppetagent_install, 'y'),
|
23
|
+
:q_puppet_cloud_install => answer_for(options, :q_puppet_cloud_install, 'y'),
|
24
24
|
:q_verify_packages => answer_for(options, :q_verify_packages, 'y'),
|
25
|
-
:q_puppet_symlinks_install => 'y',
|
26
|
-
:q_puppetagent_certname => host.to_s,
|
25
|
+
:q_puppet_symlinks_install => answer_for(options, :q_puppet_symlinks_install, 'y'),
|
26
|
+
:q_puppetagent_certname => answer_for(options, :q_puppetagent_certname, host.to_s),
|
27
27
|
|
28
28
|
# Disable database, console, and master by default
|
29
29
|
# This will be overridden by other blocks being merged in.
|
30
|
-
:q_puppetmaster_install => 'n',
|
31
|
-
:q_all_in_one_install => 'n',
|
32
|
-
:q_puppet_enterpriseconsole_install => 'n',
|
33
|
-
:q_puppetdb_install => 'n',
|
34
|
-
:q_database_install => 'n',
|
30
|
+
:q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'n'),
|
31
|
+
:q_all_in_one_install => answer_for(options, :q_all_in_one_install, 'n'),
|
32
|
+
:q_puppet_enterpriseconsole_install => answer_for(options, :q_puppet_enterpriseconsole_install, 'n'),
|
33
|
+
:q_puppetdb_install => answer_for(options, :q_puppetdb_install, 'n'),
|
34
|
+
:q_database_install => answer_for(options, :q_database_install, 'n'),
|
35
35
|
}
|
36
36
|
agent_a[:q_puppetagent_server] = masterless ? host.to_s : master.to_s
|
37
37
|
agent_a[:q_continue_or_reenter_master_hostname] = 'c' if masterless
|
38
38
|
|
39
39
|
# These base answers are needed by all
|
40
40
|
common_a = {
|
41
|
-
:q_install => 'y',
|
42
|
-
:q_vendor_packages_install => 'y',
|
41
|
+
:q_install => answer_for(options, :q_install, 'y'),
|
42
|
+
:q_vendor_packages_install => answer_for(options, :q_vendor_packages_install, 'y'),
|
43
43
|
}
|
44
44
|
|
45
45
|
unless masterless
|
46
46
|
# master/database answers
|
47
47
|
master_database_a = {
|
48
|
-
:q_puppetmaster_certname => master.to_s
|
48
|
+
:q_puppetmaster_certname => answer_for(options, :q_puppetmaster_certname, master.to_s)
|
49
49
|
}
|
50
50
|
|
51
51
|
# Master/dashboard answers
|
@@ -57,79 +57,84 @@ module Beaker
|
|
57
57
|
# Master only answers
|
58
58
|
master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
|
59
59
|
master_a = {
|
60
|
-
:q_puppetmaster_install => 'y',
|
60
|
+
:q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'y'),
|
61
61
|
:q_puppetmaster_dnsaltnames => master_dns_altnames,
|
62
|
-
:q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
|
62
|
+
:q_puppetmaster_enterpriseconsole_hostname => answer_for(options, :q_puppetmaster_enterpriseconsole_hostname, dashboard.to_s),
|
63
63
|
:q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
|
64
64
|
}
|
65
65
|
|
66
66
|
# Common answers for console and database
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
67
|
+
console_auth_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
|
68
|
+
puppetdb_database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
|
69
|
+
puppetdb_database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
|
70
|
+
puppetdb_database_password = answer_for(options, :q_puppetdb_database_password, "'#{answer_for(options, :q_puppetdb_password)}'")
|
71
|
+
console_auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
|
72
|
+
console_auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
|
73
|
+
console_auth_database_password = answer_for(options, :q_puppet_enterpriseconsole_auth_database_password, console_auth_password)
|
73
74
|
console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
|
74
75
|
console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
|
75
|
-
|
76
|
+
console_database_host = answer_for(options, :q_database_host, database.to_s)
|
77
|
+
console_database_port = answer_for(options, :q_database_port, 5432)
|
78
|
+
console_database_password = answer_for(options, :q_puppet_enterpriseconsole_database_password, console_auth_password)
|
76
79
|
|
77
80
|
console_database_a = {
|
78
|
-
:q_puppetdb_database_name =>
|
79
|
-
:q_puppetdb_database_user =>
|
80
|
-
:q_puppetdb_database_password =>
|
81
|
-
:q_puppet_enterpriseconsole_auth_database_name =>
|
82
|
-
:q_puppet_enterpriseconsole_auth_database_user =>
|
83
|
-
:q_puppet_enterpriseconsole_auth_database_password =>
|
81
|
+
:q_puppetdb_database_name => puppetdb_database_name,
|
82
|
+
:q_puppetdb_database_user => puppetdb_database_user,
|
83
|
+
:q_puppetdb_database_password => puppetdb_database_password,
|
84
|
+
:q_puppet_enterpriseconsole_auth_database_name => console_auth_database_name,
|
85
|
+
:q_puppet_enterpriseconsole_auth_database_user => console_auth_database_user,
|
86
|
+
:q_puppet_enterpriseconsole_auth_database_password => console_auth_database_password,
|
84
87
|
:q_puppet_enterpriseconsole_database_name => console_database_name,
|
85
|
-
:q_puppet_enterpriseconsole_database_user =>
|
86
|
-
:q_puppet_enterpriseconsole_database_password =>
|
87
|
-
|
88
|
-
:
|
89
|
-
:q_database_port => database_port,
|
88
|
+
:q_puppet_enterpriseconsole_database_user => console_database_user,
|
89
|
+
:q_puppet_enterpriseconsole_database_password => console_database_password,
|
90
|
+
:q_database_host => console_database_host,
|
91
|
+
:q_database_port => console_database_port,
|
90
92
|
}
|
91
93
|
|
92
94
|
# Console only answers
|
93
95
|
dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
|
94
96
|
|
95
97
|
|
98
|
+
console_install = answer_for(options, :q_puppet_enterpriseconsole_install, 'y')
|
99
|
+
console_inventory_hostname = answer_for(options, :q_puppet_enterpriseconsole_inventory_hostname, host.to_s)
|
100
|
+
console_inventory_certname = answer_for(options, :q_puppet_enterpriseconsole_inventory_certname, host.to_s)
|
101
|
+
console_inventory_dnsaltnames = answer_for(options, :q_puppet_enterpriseconsole_inventory_dnsaltnames, dashboard.to_s)
|
96
102
|
smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
|
97
103
|
smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
|
98
104
|
smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
|
99
105
|
smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
|
100
106
|
smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
|
101
107
|
console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
|
108
|
+
master_hostname = answer_for(options, :q_puppet_enterpriseconsole_master_hostname, master.to_s)
|
102
109
|
console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
|
103
110
|
|
104
111
|
console_a = {
|
105
|
-
:q_puppet_enterpriseconsole_install =>
|
106
|
-
:q_puppet_enterpriseconsole_inventory_hostname =>
|
107
|
-
:q_puppet_enterpriseconsole_inventory_certname =>
|
108
|
-
:q_puppet_enterpriseconsole_inventory_dnsaltnames =>
|
112
|
+
:q_puppet_enterpriseconsole_install => console_install,
|
113
|
+
:q_puppet_enterpriseconsole_inventory_hostname => console_inventory_hostname,
|
114
|
+
:q_puppet_enterpriseconsole_inventory_certname => console_inventory_certname,
|
115
|
+
:q_puppet_enterpriseconsole_inventory_dnsaltnames => console_inventory_dnsaltnames,
|
109
116
|
:q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
|
110
|
-
:q_puppet_enterpriseconsole_master_hostname =>
|
111
|
-
|
117
|
+
:q_puppet_enterpriseconsole_master_hostname => master_hostname,
|
112
118
|
:q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
|
113
|
-
:q_puppet_enterpriseconsole_auth_password =>
|
114
|
-
|
119
|
+
:q_puppet_enterpriseconsole_auth_password => console_auth_password,
|
115
120
|
:q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
|
116
|
-
|
117
121
|
:q_puppet_enterpriseconsole_smtp_host => smtp_host,
|
118
122
|
:q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
|
119
123
|
:q_puppet_enterpriseconsole_smtp_port => smtp_port,
|
120
124
|
}
|
121
125
|
|
122
126
|
if smtp_password and smtp_username
|
127
|
+
console_smtp_user_auth = answer_for(options, :q_puppet_enterpriseconsole_smtp_user_auth, 'y')
|
123
128
|
console_a.merge!({
|
124
129
|
:q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
|
125
130
|
:q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
|
126
|
-
:q_puppet_enterpriseconsole_smtp_user_auth =>
|
131
|
+
:q_puppet_enterpriseconsole_smtp_user_auth => console_smtp_user_auth
|
127
132
|
})
|
128
133
|
end
|
129
134
|
|
130
135
|
# Database only answers
|
131
136
|
database_a = {
|
132
|
-
:q_puppetdb_install => 'y',
|
137
|
+
:q_puppetdb_install => answer_for(options, :q_puppetdb_install, 'y'),
|
133
138
|
:q_database_install => answer_for(options, :q_database_install, 'y'),
|
134
139
|
:q_database_root_password => "'#{answer_for(options, :q_database_root_password, '=ZYdjiP3jCwV5eo9s1MBd')}'",
|
135
140
|
:q_database_root_user => answer_for(options, :q_database_root_user, 'pe-postgres'),
|
@@ -138,7 +143,7 @@ module Beaker
|
|
138
143
|
|
139
144
|
# Special answers for special hosts
|
140
145
|
aix_a = {
|
141
|
-
:q_run_updtvpkg => 'y',
|
146
|
+
:q_run_updtvpkg => answer_for(options, :q_run_updtvpkg, 'y'),
|
142
147
|
}
|
143
148
|
|
144
149
|
answers = common_a.dup
|
@@ -205,8 +210,8 @@ module Beaker
|
|
205
210
|
if @options[:type] == :upgrade and h[:pe_ver] =~ /\A3.0/
|
206
211
|
# 3.0.x to 3.0.x should require no answers
|
207
212
|
the_answers[h.name] = {
|
208
|
-
:q_install => 'y',
|
209
|
-
:q_install_vendor_packages => 'y',
|
213
|
+
:q_install => answer_for(@options, :q_install, 'y'),
|
214
|
+
:q_install_vendor_packages => answer_for(@options, :q_install_vendor_packages, 'y'),
|
210
215
|
}
|
211
216
|
else
|
212
217
|
the_answers[h.name] = host_answers(h, master, database, dashboard, @options)
|