unix.rb in beaker-2.4.0

- old
+ new

@@ -20,13 +20,15 @@
         'user'          => 'root',
         'group'         => 'pe-puppet',
         'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
         'puppetservice'    => 'pe-httpd',
         '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',
         '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',
@@ -40,13 +42,15 @@
         'user'              => 'root',
         'group'             => 'puppet',
         'puppetserver-confdir' => '/etc/puppetserver/conf.d',
         'puppetservice'     => 'puppetmaster',
         'puppetpath'        => '/etc/puppet',
+        'puppetconfdir'     => '/etc/puppet',
         'puppetvardir'      => '/var/lib/puppet',
         'puppetbin'         => '/usr/bin/puppet',
         'puppetbindir'      => '/usr/bin',
+        'systembindir'      => '/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',
@@ -56,15 +60,21 @@
       })
     end
 
     def self.aio_defaults
       h = self.foss_defaults
-      h['puppetbindir'] = '/opt/puppetlabs/agent/bin'
-      h['puppetpath'] = '/opt/puppetlabs/agent'
-      h['puppetvardir'] = '/opt/puppetlabs/agent/cache'
-      h['distmoduledir'] = '/opt/puppetlabs/agent/modules'
-      h['sitemoduledir'] = '/etc/puppetlabs/agent/modules'
-      h['hieraconf'] = ' /etc/puppetlabs/agent/hiera.conf'
+      h['puppetserver-confdir'] = '/etc/puppetlabs/puppetserver/conf.d'
+      h['puppetservice']  = 'puppetserver'
+      h['puppetbindir']   = '/opt/puppetlabs/agent/bin'
+      h['puppetbin']      = "#{h['puppetbindir']}/puppet"
+      h['puppetpath']     = '/etc/puppetlabs/agent'
+      h['puppetconfdir']  = "#{h['puppetpath']}/config"
+      h['puppetcodedir']  = "#{h['puppetpath']}/code"
+      h['puppetvardir']   = '/opt/puppetlabs/agent/cache'
+      h['distmoduledir']  = "#{h['puppetcodedir']}/modules"
+      h['sitemoduledir']  = '/opt/puppetlabs/agent/modules'
+      h['hieraconf']      = "#{h['puppetcodedir']}/hiera.yaml"
+      h['hieradatadir']   = "#{h['puppetcodedir']}/hieradata"
       h
     end
   end
 end