unix.rb in beaker-1.17.0

- old
+ new
@@ -18,28 +18,32 @@
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'          => 'root',
         'group'         => 'pe-puppet',
         'master-start-curl-retries' => 120,
-        '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',
-        'hieraconf'     => '/etc/puppetlabs/puppet/hiera.yaml',
-        'distmoduledir' => '/etc/puppetlabs/puppet/modules',
-        'sitemoduledir' => '/opt/puppet/share/puppet/modules',
-        'pathseparator' => ':',
+        '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',
+        'puppetsbindir'    => '/opt/puppet/sbin',
+        'puppetvardir'     => '/var/opt/lib/pe-puppet',
+        'hieradatadir'     => '/var/lib/hiera',
+        'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
+        'distmoduledir'    => '/etc/puppetlabs/puppet/modules',
+        'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
+        'pathseparator'    => ':',
       })
     end
 
     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',
         'puppetbindir'      => '/usr/bin',
         'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',