unix.rb in beaker-2.6.0

- old
+ new

@@ -24,11 +24,11 @@
         'puppetpath'       => '/etc/puppetlabs/puppet',
         'puppetconfdir'    => '/etc/puppetlabs/puppet',
         'puppetbin'        => '/opt/puppet/bin/puppet',
         'puppetbindir'     => '/opt/puppet/bin',
         'puppetsbindir'    => '/opt/puppet/sbin',
-        'systembindir'     => '/opt/puppet/bin',
+        'privatebindir'    => '/opt/puppetlabs/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',
@@ -46,11 +46,11 @@
         'puppetpath'        => '/etc/puppet',
         'puppetconfdir'     => '/etc/puppet',
         'puppetvardir'      => '/var/lib/puppet',
         'puppetbin'         => '/usr/bin/puppet',
         'puppetbindir'      => '/usr/bin',
-        'systembindir'      => '/usr/bin',
+        'privatebindir'     => '/usr/bin',
         'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',
         'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'hieradatadir'      => '/etc/puppet/hieradata',
         'hieraconf'         => '/etc/puppet/hiera.yaml',
@@ -62,20 +62,11 @@
 
     def self.aio_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'                  => 'root',
-        'group'                 => 'puppet',
-        'puppetserver-confdir'  => '/etc/puppetlabs/puppetserver/conf.d',
-        'puppetservice'         => 'puppetserver',
-        'puppetpath'            => '/etc/puppetlabs/puppet',
-        'puppetconfdir'         => '/etc/puppetlabs/puppet',
-        'puppetvardir'          => '/opt/puppetlabs/puppet/cache',
-        'puppetbin'             => '/opt/puppetlabs/puppet/bin/puppet',
         'puppetbindir'          => '/opt/puppetlabs/bin',
-        'systembindir'          => '/usr/bin',
-        'hieradatadir'          => '/etc/puppetlabs/code/hieradata',
-        'hieraconf'             => '/etc/puppetlabs/code/hiera.yaml',
+        'privatebindir'         => '/opt/puppetlabs/puppet/bin',
         'distmoduledir'         => '/etc/puppetlabs/code/modules',
         'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
         'pathseparator'         => ':',
       })
     end