beaker 2.46.0 → 2.47.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MTY0YTEwOTYzZjU0ODM0NmVmNzFhNzg0MWU4YjA4ZDljNWFmMTc4ZQ==
4
+ NjI2YzY2M2ViYjg0OTEyNGI2ZDc3ZTg4OGUxODgxNDQ3NzhiOWFjMw==
5
5
  data.tar.gz: !binary |-
6
- MzU1YzQ0MjczYTA4OTdjNDQyZmE5MDM5MTUyYjY4ZTE3N2FlNWZlZg==
6
+ ODVlZDM2ODQwYjg2ZDAyOGNjYzkxOTU2OWM1MWI4MzhhYzVjNzNlMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YTgzYTZhNTQyMDgxOGU3MDA1YTQyNDA2YWEzNGM3NzBhODc3NTJiM2QxZWRh
10
- Y2NiNjgxNzQ0MmVlYmZmZjRhOGY5YWE1Yjc4MjZmNGFjOWMwODk1ZDUzZDQ5
11
- ZWEzMzUxNDEyNGNmZjk0YmQ4ODQ4ZTYwNjZkM2RiNTE1NTE5NmM=
9
+ YmJmNTY4NjA4NzQxZDFiZjZlYzI2ODg4Y2IxZGE2ZjMzMTllMjdkYWU5OTM5
10
+ MTg0OTJmNjkwYWYwZjY4MGNmMWNmYmFhMWM4ZmM2YTNlZjg3NDg2ZjdhOWNj
11
+ Njk5OTY0MTczZTJjNzJiODIxNTk3OWIzZjY4MGMzNzM0MmNjM2Q=
12
12
  data.tar.gz: !binary |-
13
- MTM1YjhlODRiNTlhNTU0MjNiMGNkZjk4NTU5N2JhZmFlYmEyY2IxZmNmOGNk
14
- ZWYxMmQyM2I4MWNmNWI2NTM3ZGE0YTY1ZTg4N2M5NDMyMzA3Nzc5YTE1Y2Ux
15
- YWFiYTdhOTYwMDQ2ZjY2ZTZhMTViZDlkOGY1YzIwYzY3MzhmYjg=
13
+ YTY1YWUxYjhhZDVjNzBlNDkxMWRkMzI5MDA5ZTM1OTRjOGNhM2I4MTUyNmQx
14
+ N2IwYTg5M2E2ODY2Yjk0Yzg0MmQ3Yjc3NjkwYzEzOGE2ZmMxMjBiMzAxYWMx
15
+ YzAxOTRmZjRjNTRhZGIxNzRjMTExYmYxN2JjMzI1ZjJiNjA5YWQ=
data/CONTRIBUTING.md CHANGED
@@ -2,13 +2,11 @@
2
2
 
3
3
  ## Getting Started
4
4
 
5
- * If it is accessible to you, create a [Jira account](http://tickets.puppetlabs.com)
5
+ * Create a [Jira account](http://tickets.puppetlabs.com)
6
6
  * Make sure you have a [GitHub account](https://github.com/signup/free)
7
7
  * Submit a ticket for your issue, assuming one does not already exist.
8
8
  * Clearly describe the issue including steps to reproduce when it is a bug.
9
- * File in the appropriate location:
10
- * Using your [Jira account](http://tickets.puppetlabs.com)
11
- * Beaker bugs are submitted in the [BKR project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
9
+ * File a ticket in the [BKR project](https://tickets.puppetlabs.com/issues/?jql=project%20%3D%20BKR)
12
10
  * Fork the [Beaker repository on GitHub](https://github.com/puppetlabs/beaker)
13
11
 
14
12
  ## Making Changes
@@ -33,15 +31,22 @@
33
31
  from our issue tracker. The body describes the behavior without the patch,
34
32
  why this is a problem, and how the patch fixes the problem when applied.
35
33
  ````
36
-
37
- * Make sure you have added [RSpec](http://rspec.info/) tests that exercise your new code. These test should be located in the appropriate `beaker/spec/` subdirectory. The addition of new methods/classes or the addition of code paths to existing methods/classes requires additional RSpec coverage.
38
- * Beaker uses RSpec 3.1.0+, and you should **NOT USE** deprecated `should`/`stub` methods - **USE** `expect`/`allow`. Use of deprecated RSpec methods will result in your patch being rejected. See a nice blog post from 2013 on [RSpec's new message expectation syntax](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/).
39
- * Make sure that you have added documentation using [Yard](http://yardoc.org/), new methods/classes without apporpriate documentation will be rejected.
40
- * Run the tests to assure nothing else was accidentally broken, using `rake test`
41
- * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 2.0, etc). Beaker supports Ruby 1.9+, and breakage of support for older/newer rubies will cause a patch to be rejected.
34
+
42
35
  * During the time that you are working on your patch the master Beaker branch may have changed - you'll want to [rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) before you submit your PR with `git rebase master`. A successful rebase ensures that your patch will cleanly merge into Beaker.
43
36
  * Submitted patches will be smoke tested through a series of acceptance level tests that ensures basic Beaker functionality - the results of these tests will be evaluated by a Beaker team member. Failures associated with the submitted patch will result in the patch being rejected.
44
37
 
38
+ ### Testing
39
+
40
+ * Make sure you have added [RSpec](http://rspec.info/) tests that exercise your new code. These test should be located in the appropriate `beaker/spec/` subdirectory. The addition of new methods/classes or the addition of code paths to existing methods/classes requires additional RSpec coverage.
41
+ * Beaker uses RSpec 3.1.0+, and you should **NOT USE** deprecated `should`/`stub` methods - **USE** `expect`/`allow`. Use of deprecated RSpec methods will result in your patch being rejected. See a nice blog post from 2013 on [RSpec's new message expectation syntax](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/).
42
+ * Run the tests to assure nothing else was accidentally broken, using `rake test`
43
+ * **Bonus**: if possible ensure that `rake test` runs without failures for additional Ruby versions (1.9, 2.0, etc). Beaker supports Ruby 1.9+, and breakage of support for older/newer rubies will cause a patch to be rejected.
44
+
45
+ ### Documentation
46
+
47
+ * Make sure that you have added documentation using [Yard](http://yardoc.org/), new methods/classes without appropriate documentation will be rejected.
48
+ * More user friendly documentation will be required for PRs unless exempted. Documentation lives in the [docs/ folder](docs).
49
+
45
50
  ## Making Trivial Changes
46
51
 
47
52
  ### Maintenance
data/HISTORY.md CHANGED
@@ -1,6 +1,7 @@
1
1
  # default - History
2
2
  ## Tags
3
- * [LATEST - 8 Jul, 2016 (0fb3408c)](#LATEST)
3
+ * [LATEST - 13 Jul, 2016 (8bd72c92)](#LATEST)
4
+ * [2.46.0 - 8 Jul, 2016 (3a650c95)](#2.46.0)
4
5
  * [2.45.0 - 29 Jun, 2016 (c0b56972)](#2.45.0)
5
6
  * [2.44.0 - 9 Jun, 2016 (38dfb77f)](#2.44.0)
6
7
  * [2.43.0 - 1 Jun, 2016 (777469ca)](#2.43.0)
@@ -122,7 +123,149 @@
122
123
  * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
123
124
 
124
125
  ## Details
125
- ### <a name = "LATEST">LATEST - 8 Jul, 2016 (0fb3408c)
126
+ ### <a name = "LATEST">LATEST - 13 Jul, 2016 (8bd72c92)
127
+
128
+ * (GEM) update beaker version to 2.47.0 (8bd72c92)
129
+
130
+ * Merge pull request #1181 from tvpartytonight/maint_pin_gems (e89c0b8f)
131
+
132
+
133
+ ```
134
+ Merge pull request #1181 from tvpartytonight/maint_pin_gems
135
+
136
+ (maint) Pin gems that removed ruby 1.9.3 support
137
+ ```
138
+ * (maint) Pin gems that removed ruby 1.9.3 support (94bd58e8)
139
+
140
+
141
+ ```
142
+ (maint) Pin gems that removed ruby 1.9.3 support
143
+
144
+ This PR pins gems that are transitive dependencies that dropped ruby
145
+ 1.9.3 support. This should be removed eventually, as these gems are not
146
+ actually needed by beaker itself, but by gems beaker relies on.
147
+ ```
148
+ * (BKR-859) Add rake quick start tasks (#1176) (31a99a1a)
149
+
150
+
151
+ ```
152
+ (BKR-859) Add rake quick start tasks (#1176)
153
+
154
+ * (BKR-859) Add rake quick start tasks
155
+ For generating hosts file, test suite and running test (on vmpooler)
156
+
157
+ * Some fixes.
158
+ ```
159
+ * Merge pull request #1129 from samwoods1/install_in_parallel (c8d60edf)
160
+
161
+
162
+ ```
163
+ Merge pull request #1129 from samwoods1/install_in_parallel
164
+
165
+ (QA-2501) add ability to install hosts in parallel
166
+ ```
167
+ * Merge pull request #1178 from tvpartytonight/BKR-869 (7b71a640)
168
+
169
+
170
+ ```
171
+ Merge pull request #1178 from tvpartytonight/BKR-869
172
+
173
+ (BKR-869) Skip deploy_package_repo tests when Fedora
174
+ ```
175
+ * Merge pull request #1177 from tvpartytonight/BKR-871_revert (4b875e9b)
176
+
177
+
178
+ ```
179
+ Merge pull request #1177 from tvpartytonight/BKR-871_revert
180
+
181
+ Revert "(BKR-871) Don't test packages on Windows"
182
+ ```
183
+ * (BKR-869) Skip deploy_package_repo tests when Fedora (0491cffa)
184
+
185
+
186
+ ```
187
+ (BKR-869) Skip deploy_package_repo tests when Fedora
188
+
189
+ Because we are missing packages for Fedora for puppetserver, we should
190
+ skip them until they become available.
191
+ ```
192
+ * Merge pull request #1169 from james-stocks/BKR-797 (b7eab4ea)
193
+
194
+
195
+ ```
196
+ Merge pull request #1169 from james-stocks/BKR-797
197
+
198
+ (BKR-797) timesync helper should handle ntpd already running
199
+ ```
200
+ * (BKR-874) PUPPET_MODULE_INSTALL_IGNORE (#1175) (8b0c4a4e)
201
+
202
+
203
+ ```
204
+ (BKR-874) PUPPET_MODULE_INSTALL_IGNORE (#1175)
205
+
206
+ Updated the filtering on PUPPET_MODULE_INSTALL_IGNORE to exclude .svn,
207
+ junit, pkg and example folders
208
+ ```
209
+ * Revert "(BKR-871) Don't test packages on Windows" (3f8afefc)
210
+
211
+
212
+ ```
213
+ Revert "(BKR-871) Don't test packages on Windows"
214
+
215
+ This reverts commit 480cbad5f8b75c9cb96d104e2537bc8771ed4f8c.
216
+ ```
217
+ * Merge pull request #1174 from erosa/maint/master/fix-dsl-example (f2274451)
218
+
219
+
220
+ ```
221
+ Merge pull request #1174 from erosa/maint/master/fix-dsl-example
222
+
223
+ (maint) Add missing parenthesis in dsl.rb docs
224
+ ```
225
+ * Merge pull request #1172 from kevpl/docs_add_doc_requirement (4b2ea02b)
226
+
227
+
228
+ ```
229
+ Merge pull request #1172 from kevpl/docs_add_doc_requirement
230
+
231
+ (MAINT) updated contributor guidelines
232
+ ```
233
+ * (maint) Add missing parenthesis in dsl.rb docs (51eeaf19)
234
+
235
+
236
+ ```
237
+ (maint) Add missing parenthesis in dsl.rb docs
238
+
239
+ Prior to this commit, there was a missing closing paren in the code
240
+ examples in the DSL documentation.
241
+
242
+ This commit rectifies that issue.
243
+ ```
244
+ * (MAINT) updated contributor guidelines (395d0696)
245
+
246
+
247
+ ```
248
+ (MAINT) updated contributor guidelines
249
+
250
+ added in user friendly docs & acceptance testing requirements
251
+ [skip ci]
252
+ ```
253
+ * (BKR-797) timesync helper should handle ntpd already running (d77c3bb5)
254
+
255
+
256
+ ```
257
+ (BKR-797) timesync helper should handle ntpd already running
258
+
259
+ This commit fixes a bug where timesync causes beaker to error if the host has ntpd already running.
260
+ The fix is simply to use the -u option for ntpdate to use an alternate network port.
261
+
262
+ Tested on Redhat and Ubuntu.
263
+ ```
264
+ * (QA-2501) add ability to install hosts in parallel (de50ffe1)
265
+
266
+ ### <a name = "2.46.0">2.46.0 - 8 Jul, 2016 (3a650c95)
267
+
268
+ * (HISTORY) update beaker history for gem release 2.46.0 (3a650c95)
126
269
 
127
270
  * (GEM) update beaker version to 2.46.0 (0fb3408c)
128
271
 
@@ -106,4 +106,36 @@ test_name "dsl::helpers::host_helpers #on" do
106
106
  assert_match /\d+:\d+/, stdout
107
107
  end
108
108
  end
109
+
110
+ step "#on executes in parallel with :run_in_parallel => true" do
111
+ parent_pid = Process.pid
112
+ results = on( hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}"}, :run_in_parallel => true) {
113
+ assert(Process.pid != parent_pid)
114
+ }
115
+
116
+ # assert that we got results back for every host
117
+ assert_equal hosts.size, results.size
118
+
119
+ # that they were all successful runs
120
+ results.each do |result|
121
+ assert_equal 0, result.exit_code
122
+ end
123
+
124
+ # and that we have |hosts| distinct outputs
125
+ unique_outputs = results.map(&:output).uniq
126
+ assert_equal hosts.size, unique_outputs.size
127
+ end
128
+
129
+ step "#on in parallel exits after all processes complete if an exception is raised in one process" do
130
+ start = Time.now
131
+
132
+ tmp = nil
133
+ assert_raises NoMethodError do
134
+ on( hosts, %Q{echo "blah"}, :run_in_parallel => true) {
135
+ sleep(1)
136
+ tmp.blah
137
+ }
138
+ end
139
+ assert(Time.now > start + 1)
140
+ end
109
141
  end
@@ -1,5 +1,5 @@
1
1
  test_name 'confirm packages on hosts behave correctly'
2
- confine :except, :platform => [/osx/,/windows/]
2
+ confine :except, :platform => %w(osx)
3
3
 
4
4
  def get_host_pkg(host)
5
5
  case
@@ -74,4 +74,4 @@ hosts.each do |host|
74
74
  end
75
75
  end
76
76
 
77
- end
77
+ end
@@ -56,6 +56,7 @@ end
56
56
 
57
57
  step '#deploy_package_repo : deploy puppet-server nightly repo'
58
58
  hosts.each do |host|
59
+ next if host['platform'] =~ /fedora/
59
60
  host.deploy_package_repo(pkg_fixtures, pkg_name, 'latest')
60
61
  clean_file(host, pkg_name)
61
62
  end
data/beaker.gemspec CHANGED
@@ -24,13 +24,15 @@ Gem::Specification.new do |s|
24
24
  s.add_development_dependency 'rake', '~> 10.1'
25
25
  s.add_development_dependency 'simplecov'
26
26
  s.add_development_dependency 'pry', '~> 0.10'
27
- s.add_development_dependency 'beaker-hostgenerator'
28
27
 
29
28
  # Documentation dependencies
30
29
  s.add_development_dependency 'yard'
31
30
  s.add_development_dependency 'markdown'
32
31
  s.add_development_dependency 'thin'
33
32
 
33
+ # Temporary pin for gems no longer compatible with ruby 1.9.3
34
+ s.add_development_dependency 'activesupport', '~> 4.2'
35
+ s.add_development_dependency 'rack', '~> 1.6'
34
36
  # Run time dependencies
35
37
  s.add_runtime_dependency 'minitest', '~> 5.4'
36
38
  s.add_runtime_dependency 'json', '~> 1.8'
@@ -40,12 +42,14 @@ Gem::Specification.new do |s|
40
42
  s.add_runtime_dependency 'inifile', '~> 2.0'
41
43
  s.add_runtime_dependency 'rsync', '~> 1.0.9'
42
44
  s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
45
+ s.add_runtime_dependency 'in-parallel', '~> 0.1'
43
46
 
44
47
  # Run time dependencies that are Beaker libraries
45
48
  s.add_runtime_dependency 'beaker-answers', '~> 0.0'
46
49
  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
47
50
  s.add_runtime_dependency 'beaker-hiera', '~> 0.0'
48
51
  s.add_runtime_dependency 'beaker-pe', '~> 0.0'
52
+ s.add_runtime_dependency 'beaker-hostgenerator'
49
53
 
50
54
  # Optional provisioner specific support
51
55
  s.add_runtime_dependency 'rbvmomi', '~> 1.8'
@@ -16,13 +16,16 @@ Beaker uses arguments and settings from a variety of sources to determine how yo
16
16
  ```
17
17
  BEAKER VARIABLE NAME => ENVIRONMENT VARIABLE NAME
18
18
  :home => 'HOME',
19
- :project => ['BEAKER_PROJECT', 'BEAKER_project'],
19
+ :project => ['BEAKER_PROJECT', 'BEAKER_project', 'JOB_NAME'],
20
20
  :department => ['BEAKER_DEPARTMENT', 'BEAKER_department'],
21
21
  :jenkins_build_url => ['BEAKER_BUILD_URL', 'BUILD_URL'],
22
22
  :created_by => ['BEAKER_CREATED_BY'],
23
23
  :consoleport => ['BEAKER_CONSOLEPORT', 'consoleport'],
24
24
  :is_pe => ['BEAKER_IS_PE', 'IS_PE'],
25
25
  :pe_dir => ['BEAKER_PE_DIR', 'pe_dist_dir'],
26
+ :puppet_agent_version => ['BEAKER_PUPPET_AGENT_VERSION'],
27
+ :puppet_agent_sha => ['BEAKER_PUPPET_AGENT_SHA'],
28
+ :puppet_collection => ['BEAKER_PUPPET_COLLECTION'],
26
29
  :pe_version_file => ['BEAKER_PE_VERSION_FILE', 'pe_version_file'],
27
30
  :pe_ver => ['BEAKER_PE_VER', 'pe_ver'],
28
31
  :forge_host => ['BEAKER_FORGE_HOST', 'forge_host'],
@@ -31,7 +34,9 @@ Beaker uses arguments and settings from a variety of sources to determine how yo
31
34
  :release_yum_repo_url => ['BEAKER_RELEASE_YUM_REPO', 'RELEASE_YUM_REPO'],
32
35
  :dev_builds_url => ['BEAKER_DEV_BUILDS_URL', 'DEV_BUILDS_URL'],
33
36
  :vbguest_plugin => ['BEAKER_VB_GUEST_PLUGIN', 'BEAKER_vb_guest_plugin'],
34
- :answers => [/\Aq_*'/],
37
+ :tag_includes => ['BEAKER_TAG'],
38
+ :tag_excludes => ['BEAKER_EXCLUDE_TAG'],
39
+ :run_in_parallel => ['BEAKER_RUN_IN_PARALLEL'],
35
40
  ```
36
41
  ## Host File Options
37
42
  Any values included for an individual host in a host file.
@@ -191,10 +196,14 @@ Values already included in Beaker as defaults for required arguments.
191
196
  :project => 'Beaker',
192
197
  :department => 'unknown',
193
198
  :created_by => ENV['USER'] || ENV['USERNAME'] || 'unknown',
199
+ :host_tags => {},
194
200
  :openstack_api_key => ENV['OS_PASSWORD'],
195
201
  :openstack_username => ENV['OS_USERNAME'],
196
202
  :openstack_auth_url => "#{ENV['OS_AUTH_URL']}/tokens",
197
203
  :openstack_tenant => ENV['OS_TENANT_NAME'],
204
+ :openstack_keyname => ENV['OS_KEYNAME'],
205
+ :openstack_network => ENV['OS_NETWORK'],
206
+ :openstack_region => ENV['OS_REGION'],
198
207
  :jenkins_build_url => nil,
199
208
  :validate => true,
200
209
  :configure => true,
@@ -211,25 +220,29 @@ Values already included in Beaker as defaults for required arguments.
211
220
  :project_root => File.expand_path(File.join(File.dirname(__FILE__), "../")),
212
221
  :xml_dir => 'junit',
213
222
  :xml_file => 'beaker_junit.xml',
223
+ :xml_time => 'beaker_times.xml',
224
+ :xml_time_enabled => false,
214
225
  :xml_stylesheet => 'junit.xsl',
226
+ :default_log_prefix => 'beaker_logs',
215
227
  :log_dir => 'log',
216
228
  :log_sut_event => 'sut.log',
217
229
  :color => true,
218
230
  :dry_run => false,
219
- :timeout => 300,
231
+ :tag_includes => '',
232
+ :tag_excludes => '',
233
+ :timeout => 900, # 15 minutes
220
234
  :fail_mode => 'slow',
221
235
  :accept_all_exit_codes => false,
222
236
  :timesync => false,
223
237
  :disable_iptables => false,
224
238
  :set_env => true,
239
+ :disable_updates => true,
225
240
  :repo_proxy => false,
226
241
  :package_proxy => false,
227
242
  :add_el_extras => false,
228
- :release_apt_repo_url => "http://apt.puppetlabs.com",
229
- :release_yum_repo_url => "http://yum.puppetlabs.com",
230
- :dev_builds_url => "http://builds.delivery.puppetlabs.net",
231
243
  :epel_url => "http://mirrors.kernel.org/fedora-epel",
232
244
  :epel_arch => "i386",
245
+ :epel_7_pkg => "epel-release-7-6.noarch.rpm",
233
246
  :epel_6_pkg => "epel-release-6-8.noarch.rpm",
234
247
  :epel_5_pkg => "epel-release-5-4.noarch.rpm",
235
248
  :consoleport => 443,
@@ -237,51 +250,30 @@ Values already included in Beaker as defaults for required arguments.
237
250
  :pe_version_file => 'LATEST',
238
251
  :pe_version_file_win => 'LATEST-win',
239
252
  :host_env => {},
253
+ :host_name_prefix => nil,
240
254
  :ssh_env_file => '~/.ssh/environment',
241
255
  :profile_d_env_file => '/etc/profile.d/beaker_env.sh',
242
- :answers => {
243
- :q_puppet_enterpriseconsole_auth_user_email => 'admin@example.com',
244
- :q_puppet_enterpriseconsole_auth_password => '~!@#$%^*-/ aZ',
245
- :q_puppet_enterpriseconsole_smtp_port => 25,
246
- :q_puppet_enterpriseconsole_smtp_use_tls => 'n',
247
- :q_verify_packages => 'y',
248
- :q_puppetdb_password => '~!@#$%^*-/ aZ',
249
- :q_puppetmaster_enterpriseconsole_port => 443,
250
- :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
251
- :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
252
- :q_puppet_enterpriseconsole_database_name => 'console',
253
- :q_puppet_enterpriseconsole_database_user => 'mYc0nS03u3r',
254
- :q_database_root_password => '=ZYdjiP3jCwV5eo9s1MBd',
255
- :q_database_root_user => 'pe-postgres',
256
- :q_database_export_dir => '/tmp',
257
- :q_puppetdb_database_name => 'pe-puppetdb',
258
- :q_puppetdb_database_user => 'mYpdBu3r',
259
- :q_database_port => 5432,
260
- :q_puppetdb_port => 8081,
261
- :q_classifier_database_user => 'DFGhjlkj',
262
- :q_database_name => 'pe-classifier',
263
- :q_classifier_database_password => '~!@#$%^*-/ aZ',
264
- :q_activity_database_user => 'adsfglkj',
265
- :q_activity_database_name => 'pe-activity',
266
- :q_activity_database_password => '~!@#$%^*-/ aZ',
267
- :q_rbac_database_user => 'RbhNBklm',
268
- :q_rbac_database_name => 'pe-rbac',
269
- :q_rbac_database_password => '~!@#$%^*-/ aZ',
270
- :q_install_update_server => 'y',
271
- },
272
256
  :dot_fog => File.join(ENV['HOME'], '.fog'),
273
257
  :ec2_yaml => 'config/image_templates/ec2.yaml',
274
258
  :help => false,
275
- :collect_perf_data => false,
259
+ :collect_perf_data => 'none',
260
+ :puppetdb_port_ssl => 8081,
261
+ :puppetdb_port_nonssl => 8080,
262
+ :puppetserver_port => 8140,
263
+ :nodeclassifier_port => 4433,
264
+ :cache_files_locally => true,
265
+ :aws_keyname_modifier => rand(10 ** 10).to_s.rjust(10,'0'), # 10 digit random number string
266
+ :run_in_parallel => [],
276
267
  :ssh => {
277
268
  :config => false,
278
269
  :paranoid => false,
279
- :timeout => 300,
280
270
  :auth_methods => ["publickey"],
281
271
  :port => 22,
282
272
  :forward_agent => true,
283
273
  :keys => ["#{ENV['HOME']}/.ssh/id_rsa"],
284
274
  :user_known_hosts_file => "#{ENV['HOME']}/.ssh/known_hosts",
275
+ :keepalive => true
276
+
285
277
  }
286
278
  }
287
279
  ```