lib/beaker/host/unix.rb in beaker-1.9.1 vs lib/beaker/host/unix.rb in beaker-1.10.0
- old
+ new
@@ -20,10 +20,13 @@
def self.pe_defaults
h = Beaker::Options::OptionsHash.new
h.merge({
'user' => 'root',
'group' => 'pe-puppet',
+ 'service-wait' => false,
+ 'service-prefix'=> '/etc/init.d/',
+ 'puppetservice' => 'pe-httpd',
'puppetpath' => '/etc/puppetlabs/puppet',
'puppetbin' => '/opt/puppet/bin/puppet',
'puppetbindir' => '/opt/puppet/bin',
'puppetvardir' => '/var/opt/lib/pe-puppet',
'hieradatadir' => '/var/lib/hiera',
@@ -37,9 +40,10 @@
def self.foss_defaults
h = Beaker::Options::OptionsHash.new
h.merge({
'user' => 'root',
'group' => 'puppet',
+ 'service-wait' => false,
'puppetpath' => '/etc/puppet',
'puppetvardir' => '/var/lib/puppet',
'puppetbin' => '/usr/bin/puppet',
'puppetbindir' => '/usr/bin',
'hieralibdir' => '/opt/puppet-git-repos/hiera/lib',