lib/beaker/host/unix.rb in beaker-1.17.1 vs lib/beaker/host/unix.rb in beaker-1.17.2
- old
+ new
@@ -17,11 +17,10 @@
def self.pe_defaults
h = Beaker::Options::OptionsHash.new
h.merge({
'user' => 'root',
'group' => 'pe-puppet',
- 'master-start-curl-retries' => 120,
'jvm-puppet-confdir' => '/etc/puppetlabs/jvm-puppet/conf.d',
'puppetservice' => 'pe-httpd',
'puppetpath' => '/etc/puppetlabs/puppet',
'puppetbin' => '/opt/puppet/bin/puppet',
'puppetbindir' => '/opt/puppet/bin',
@@ -38,10 +37,9 @@
def self.foss_defaults
h = Beaker::Options::OptionsHash.new
h.merge({
'user' => 'root',
'group' => 'puppet',
- 'master-start-curl-retries' => 120,
'jvm-puppet-confdir' => '/etc/jvm-puppet/conf.d',
'puppetservice' => 'puppetmaster',
'puppetpath' => '/etc/puppet',
'puppetvardir' => '/var/lib/puppet',
'puppetbin' => '/usr/bin/puppet',