beaker 2.13.0 → 2.14.0

data/lib/beaker/answers/version20.rb

@@ -21,8 +21,8 @@ module Beaker
         :q_puppet_cloud_install => 'y',
         :q_puppet_symlinks_install => 'y',
         :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host,
-        :q_puppetagent_server => master,
+        :q_puppetagent_certname => host.to_s,
+        :q_puppetagent_server => master.to_s,
 
         # Disable console and master by default
         # This will be overridden by other blocks being merged in
@@ -33,15 +33,15 @@ module Beaker
       master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
       master_a = {
         :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master,
+        :q_puppetmaster_certname => master.to_s,
         :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard,
+        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
         :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
         :q_puppetmaster_forward_facts => 'y',
       }
 
       dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard)}'"
+      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
       dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
       smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
       smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
@@ -64,11 +64,11 @@ module Beaker
         :q_puppet_enterpriseconsole_database_user => console_database_user,
         :q_puppet_enterpriseconsole_database_root_password => dashboard_password,
         :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host,
-        :q_puppet_enterpriseconsole_inventory_certname => host,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master,
+        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
+        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
+        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
         :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master,
+        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
         :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
         :q_puppet_enterpriseconsole_auth_password => dashboard_password,
         :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,

data/lib/beaker/answers/version28.rb

@@ -22,8 +22,8 @@ module Beaker
         :q_puppet_cloud_install => 'y',
         :q_puppet_symlinks_install => 'y',
         :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host,
-        :q_puppetagent_server => master,
+        :q_puppetagent_certname => host.to_s,
+        :q_puppetagent_server => master.to_s,
 
         # Disable console and master by default
         # This will be overridden by other blocks being merged in
@@ -34,15 +34,15 @@ module Beaker
       master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
       master_a = {
         :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master,
+        :q_puppetmaster_certname => master.to_s,
         :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard,
+        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
         :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
         :q_puppetmaster_forward_facts => 'y',
       }
 
       dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard)}'"
+      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
       dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
       smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
       smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
@@ -64,11 +64,11 @@ module Beaker
         :q_puppet_enterpriseconsole_database_name => console_database_name,
         :q_puppet_enterpriseconsole_database_user => console_database_user,
         :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host,
-        :q_puppet_enterpriseconsole_inventory_certname => host,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master,
+        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
+        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
+        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
         :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master,
+        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
         :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
         :q_puppet_enterpriseconsole_auth_password => dashboard_password,
         :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,

data/lib/beaker/answers/version30.rb

@@ -21,9 +21,9 @@ module Beaker
       agent_a = {
         :q_puppetagent_install => 'y',
         :q_puppet_cloud_install => 'y',
-        :q_verify_packages => options[:answers][:q_verify_packages],
+        :q_verify_packages => answer_for(options, :q_verify_packages, 'y'),
         :q_puppet_symlinks_install => 'y',
-        :q_puppetagent_certname => host,
+        :q_puppetagent_certname => host.to_s,
 
         # Disable database, console, and master by default
         # This will be overridden by other blocks being merged in.
@@ -33,7 +33,7 @@ module Beaker
         :q_puppetdb_install => 'n',
         :q_database_install => 'n',
       }
-      agent_a[:q_puppetagent_server] = masterless ? host : master
+      agent_a[:q_puppetagent_server] = masterless ? host.to_s : master.to_s
       agent_a[:q_continue_or_reenter_master_hostname] = 'c' if masterless
 
       # These base answers are needed by all
@@ -45,12 +45,12 @@ module Beaker
       unless masterless
         # master/database answers
         master_database_a = {
-          :q_puppetmaster_certname => master
+          :q_puppetmaster_certname => master.to_s
         }
 
         # Master/dashboard answers
         master_console_a = {
-          :q_puppetdb_hostname  => answer_for(options, :q_puppetdb_hostname, database),
+          :q_puppetdb_hostname  => answer_for(options, :q_puppetdb_hostname, database.to_s),
           :q_puppetdb_port      => answer_for(options, :q_puppetdb_port, 8081)
         }
 
@@ -59,15 +59,15 @@ module Beaker
         master_a = {
           :q_puppetmaster_install => 'y',
           :q_puppetmaster_dnsaltnames => master_dns_altnames,
-          :q_puppetmaster_enterpriseconsole_hostname => dashboard,
+          :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
           :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
         }
 
         # Common answers for console and database
         database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
         database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
-        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
-        puppetdb_password = "'#{options[:answers][:q_puppetdb_password]}'"
+        dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
+        puppetdb_password = "'#{answer_for(options, :q_puppetdb_password)}'"
         auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
         auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
         console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
@@ -85,29 +85,29 @@ module Beaker
           :q_puppet_enterpriseconsole_database_user => answer_for(options, :q_puppet_enterpriseconsole_database_user, console_database_user),
           :q_puppet_enterpriseconsole_database_password => answer_for(options, :q_puppet_enterpriseconsole_database_password, dashboard_password),
 
-          :q_database_host => answer_for(options, :q_database_host, database),
+          :q_database_host => answer_for(options, :q_database_host, database.to_s),
           :q_database_port => database_port,
         }
 
         # Console only answers
-        dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
+        dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
 
 
-        smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
-        smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
-        smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
-        smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
-        smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
+        smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
+        smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
+        smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
+        smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
+        smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
         console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
         console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
 
         console_a = {
           :q_puppet_enterpriseconsole_install => 'y',
-          :q_puppet_enterpriseconsole_inventory_hostname => host,
-          :q_puppet_enterpriseconsole_inventory_certname => host,
-          :q_puppet_enterpriseconsole_inventory_dnsaltnames => dashboard,
+          :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
+          :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
+          :q_puppet_enterpriseconsole_inventory_dnsaltnames => dashboard.to_s,
           :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-          :q_puppet_enterpriseconsole_master_hostname => master,
+          :q_puppet_enterpriseconsole_master_hostname => master.to_s,
 
           :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
           :q_puppet_enterpriseconsole_auth_password => dashboard_password,

data/lib/beaker/answers/version32.rb

@@ -20,7 +20,7 @@ module Beaker
       the_answers = super
       if dashboard != master
         # in 3.2, dashboard needs the master certname
-        the_answers[dashboard.name][:q_puppetmaster_certname] = master
+        the_answers[dashboard.name][:q_puppetmaster_certname] = master.to_s
       end
 
       # do we want to check for updates?

data/lib/beaker/answers/version34.rb

@@ -16,13 +16,13 @@ module Beaker
 
       classifier_database_user     = answer_for(@options, :q_classifier_database_user, 'DFGhjlkj')
       classifier_database_name     = answer_for(@options, :q_database_name, 'pe-classifier')
-      classifier_database_password = "'#{@options[:answers][:q_classifier_database_password]}'"
+      classifier_database_password = "'#{answer_for(@options, :q_classifier_database_password)}'"
       activity_database_user       = answer_for(@options, :q_activity_database_user, 'adsfglkj')
       activity_database_name       = answer_for(@options, :q_activity_database_name, 'pe-activity')
-      activity_database_password   = "'#{@options[:answers][:q_activity_database_password]}'"
+      activity_database_password   = "'#{answer_for(@options, :q_activity_database_password)}'"
       rbac_database_user           = answer_for(@options, :q_rbac_database_user, 'RbhNBklm')
       rbac_database_name           = answer_for(@options, :q_rbac_database_name, 'pe-rbac')
-      rbac_database_password       = "'#{@options[:answers][:q_rbac_database_password]}'"
+      rbac_database_password       = "'#{answer_for(@options, :q_rbac_database_password)}'"
 
       console_services_hash = {
         :q_classifier_database_user     => classifier_database_user,
@@ -38,7 +38,7 @@ module Beaker
 
       # If we're installing or upgrading from a non-RBAC version, set the 'admin' password
       if @options[:type] == :upgrade && @options[:set_console_password]
-        dashboard_password = "'#{@options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
+        dashboard_password = "'#{answer_for(@options, :q_puppet_enterpriseconsole_auth_password)}'"
         the_answers[dashboard.name][:q_puppet_enterpriseconsole_auth_password] = dashboard_password
       end
 

data/lib/beaker/answers/version40.rb

@@ -28,7 +28,7 @@ module Beaker
       end
 
       # add some new answers
-      update_server_host    = answer_for(@options, :q_update_server_host, master)
+      update_server_host    = answer_for(@options, :q_update_server_host, master.to_s)
       install_update_server = answer_for(@options, :q_install_update_server, 'y')
 
       the_answers.map do |key, value|

data/lib/beaker/cli.rb

@@ -161,20 +161,27 @@ module Beaker
     #
     # @return nil
     def preserve_hosts_file
+      # things that don't belong in the preserved host file
+      dontpreserve = /HOSTS|logger|timestamp|log_prefix|_dated_dir|logger_sut|pre_suite|post_suite|tests/
       preserved_hosts_filename = File.join(@options[:log_dated_dir], 'hosts_preserved.yml')
       FileUtils.cp(@options[:hosts_file], preserved_hosts_filename)
       hosts_yaml = YAML.load_file(preserved_hosts_filename)
       newly_keyed_hosts_entries = {}
-      hosts_yaml['HOSTS'].each do |host_name, host_hash|
+      hosts_yaml['HOSTS'].each do |host_name, file_host_hash|
+        h = Beaker::Options::OptionsHash.new
+        file_host_hash = h.merge(file_host_hash)
         @hosts.each do |host|
-          if host_name == host.instance_variable_get(:@name)
-            newly_keyed_hosts_entries[host.to_s] = host_hash
+          if host_name == host.name
+            newly_keyed_hosts_entries[host.reachable_name] = file_host_hash.merge(host.host_hash)
             break
           end
         end
       end
       hosts_yaml['HOSTS'] = newly_keyed_hosts_entries
-      hosts_yaml['CONFIG'] ||= {}
+      hosts_yaml['CONFIG'] = Beaker::Options::OptionsHash.new.merge(hosts_yaml['CONFIG'] || {})
+      # save the rest of the options, excepting the HOSTS that we have already processed
+      hosts_yaml['CONFIG'] = hosts_yaml['CONFIG'].merge(@options.reject{ |k,v| k =~ dontpreserve })
+      # remove copy of HOSTS information
       hosts_yaml['CONFIG']['provision'] = false
       File.open(preserved_hosts_filename, 'w') do |file|
         YAML.dump(hosts_yaml, file)

data/lib/beaker/command.rb

@@ -50,6 +50,7 @@ module Beaker
       @args    = args
       @environment = {}
       @cmdexe = @options.delete(:cmdexe) || false
+      @prepend_cmds = @options.delete(:prepend_cmds) || nil
 
       # this is deprecated and will not allow you to use a command line
       # option of `--environment`, please use ENV instead.
@@ -65,15 +66,16 @@ module Beaker
     #                      interface.
     # @param [String] cmd  An command to call.
     # @param [Hash]   env  An optional hash of environment variables to be used
+    # @param [String] pc   An optional list of commands to prepend 
     #
     # @return [String] This returns the fully formed command line invocation.
-    def cmd_line host, cmd = @command, env = @environment
+    def cmd_line host, cmd = @command, env = @environment, pc = @prepend_cmds
       env_string = env.nil? ? '' : environment_string_for( host, env )
 
       cygwin = ((host['platform'] =~ /windows/) and host.is_cygwin? and @cmdexe) ? 'cmd.exe /c' : nil
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      [env_string, cygwin, cmd, options_string, args_string].compact.reject(&:empty?).join(' ')
+      [env_string, cygwin, pc, cmd, options_string, args_string].compact.reject(&:empty?).join(' ')
     end
 
     # @param [Hash] opts These are the options that the command takes

data/lib/beaker/command_factory.rb

@@ -16,7 +16,11 @@ module Beaker
     end
 
     def execute(command, options={}, &block)
-      result = self.exec(Command.new(command), options)
+      cmd_create_options = {}
+      exec_opts = options.dup
+      cmd_create_options[:prepend_cmds] = exec_opts.delete(:prepend_cmds) || nil
+      cmd_create_options[:cmdexe] = exec_opts.delete(:cmdexe) || false
+      result = self.exec(Command.new(command, [], cmd_create_options), exec_opts)
 
       if block_given?
         yield result

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -374,11 +374,7 @@ module Beaker
         # @!macro common_opts
         #
         def curl_on(host, cmd, opts = {}, &block)
-          if options.is_pe? #check global options hash
-            on host, "curl --tlsv1 %s" % cmd, opts, &block
-          else
-            on host, "curl %s" % cmd, opts, &block
-          end
+          on host, "curl --tlsv1 %s" % cmd, opts, &block
         end
 
 
@@ -508,6 +504,22 @@ module Beaker
           end
         end
 
+        # 'echo' the provided value on the given host(s)
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        # @param [String] val The string to 'echo' on the host(s)
+        # @return [String, Array<String> The echo'ed value(s) returned by the host(s)
+        def echo_on hosts, val
+          #val = val.gsub(/"/, "\"").gsub(/\(/, "\(")
+          block_on hosts do |host|
+            if host.is_powershell?
+              host.exec(Command.new("echo #{val}")).stdout.chomp
+            else
+              host.exec(Command.new("echo \"#{val}\"")).stdout.chomp
+            end
+          end
+        end
+
 
       end
     end

data/lib/beaker/dsl/install_utils.rb

@@ -1,4 +1,4 @@
-[ 'pe', 'puppet', 'ezbake', 'module' ].each do |lib|
+[ 'foss', 'pe', 'puppet', 'ezbake', 'module' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}_utils"
 end
 
@@ -6,8 +6,9 @@ module Beaker
   module DSL
     # Collection of installation methods and support
     module InstallUtils
-      include DSL::InstallUtils::PEUtils
       include DSL::InstallUtils::PuppetUtils
+      include DSL::InstallUtils::PEUtils
+      include DSL::InstallUtils::FOSSUtils
       include DSL::InstallUtils::ModuleUtils
       include DSL::InstallUtils::EZBakeUtils
     end

data/lib/beaker/dsl/install_utils/aio_defaults.rb

@@ -0,0 +1,86 @@
+module Beaker
+  module DSL
+    module InstallUtils
+      #
+      # This module contains default values for aio paths and directorys per-platform
+      #
+      module AIODefaults
+
+        #Here be the pathing and default values for AIO installs
+        #
+        AIO_DEFAULTS = {
+          'unix' => {
+            'puppetbindir'          => '/opt/puppetlabs/bin',
+            'privatebindir'         => '/opt/puppetlabs/puppet/bin',
+            'distmoduledir'         => '/etc/puppetlabs/code/modules',
+            'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
+          },
+          'windows' => { #windows
+            'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+            'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
+            # sitemoduledir not included (check PUP-4049 for more info)
+          },
+        }
+
+        # Add the appropriate aio defaults to the host object so that they can be accessed using host[option], set host[:type] = aio
+        # @param [Host] host    A single host to act upon
+        # @param [String] platform The platform type of this host, one of windows or unix
+        def add_platform_aio_defaults(host, platform)
+          AIO_DEFAULTS[platform].each_pair do |key, val|
+            host[key] = val
+          end
+          # add group and type here for backwards compatability
+          if host['platform'] =~ /windows/
+            host['group'] = 'Administrators'
+          else
+            host['group'] = 'puppet'
+          end
+          host['type'] = 'aio'
+        end
+
+        # Add the appropriate aio defaults to an array of hosts
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        def add_aio_defaults_on(hosts)
+          block_on hosts do | host |
+            if host['platform'] =~ /windows/
+              platform = 'windows'
+            else
+              platform = 'unix'
+            end
+            add_platform_aio_defaults(host, platform)
+          end
+        end
+
+        # Remove the appropriate aio defaults from the host object so that they can no longer be accessed using host[option], set host[:type] = nil
+        # @param [Host] host    A single host to act upon
+        # @param [String] platform The platform type of this host, one of windows, pswindows, freebsd, mac & unix
+        def remove_platform_aio_defaults(host, platform)
+          AIO_DEFAULTS[platform].each_pair do |key, val|
+            host.delete(key)
+          end
+          host['type'] = nil
+          host['group'] = nil
+        end
+
+        # Remove the appropriate aio defaults from an array of hosts
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        def remove_aio_defaults_on(hosts)
+          block_on hosts do | host |
+            if host['platform'] =~ /windows/
+              platform = 'windows'
+            else
+              platform = 'unix'
+            end
+            remove_platform_aio_defaults(host, platform)
+          end
+        end
+
+
+      end
+    end
+  end
+end
+

data/lib/beaker/dsl/install_utils/foss_defaults.rb

@@ -0,0 +1,163 @@
+module Beaker
+  module DSL
+    module InstallUtils
+      #
+      # This module contains default values for FOSS puppet paths and directorys per-platform
+      #
+      module FOSSDefaults
+
+        #Here be the pathing and default values for FOSS installs
+        #
+        FOSS_DEFAULTS = {
+          'freebsd' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/usr/local/etc/puppet/modules',
+            'puppetvardir'      => '/var/lib/puppet',
+            'puppetbin'         => '/usr/bin/puppet',
+            'puppetbindir'      => '/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'      => '/usr/local/etc/puppet/modules/hieradata',
+            'hieraconf'         => '/usr/local/etc/puppet/modules/hiera.yaml',
+            'distmoduledir'     => '/usr/local/etc/puppet/modules',
+            'sitemoduledir'     => '/usr/share/puppet/modules',
+          },
+          'mac' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppet',
+            'puppetconfdir'     => '/etc/puppet',
+            'puppetcodedir'     => '/etc/puppet',
+            'puppetvardir'      => '/var/lib/puppet',
+            'puppetbin'         => '/usr/bin/puppet',
+            'puppetbindir'      => '/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',
+            'distmoduledir'     => '/etc/puppet/modules',
+            'sitemoduledir'     => '/usr/share/puppet/modules',
+          },
+          'unix' => {
+            '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',
+            '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',
+            'distmoduledir'     => '/etc/puppet/modules',
+            'sitemoduledir'     => '/usr/share/puppet/modules',
+          },
+          'windows' => { #cygwin windows
+            'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+            'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+            'puppetcodedir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+            'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
+            'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/var',
+            'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
+            'sitemoduledir'     => 'C:/usr/share/puppet/modules',
+            'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
+            'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
+            #let's just add both potential bin dirs to the path
+            'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+            'privatebindir'     => '/usr/bin',
+            'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
+          },
+          'pswindows' => { #windows windows
+            'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
+            'sitemoduledir'     => 'C:\\usr\\share\\puppet\\modules',
+            'hieralibdir'       => 'C:\\opt\\puppet-git-repos\\hiera\\lib',
+            'hierapuppetlibdir' => 'C:\\opt\\puppet-git-repos\\hiera-puppet\\lib',
+            'hierabindir'       => 'C:\\opt\\puppet-git-repos\\hiera\\bin',
+            'puppetpath'        => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc";"C:\\Program Files\\Puppet Labs\\Puppet\\etc"',
+            'hieraconf'         => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc\\hiera.yaml";"C:\\Program Files\\Puppet Labs\\Puppet\\etc\\hiera.yaml"',
+            'puppetvardir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\var";"C:\\Program Files\\Puppet Labs\\Puppet\\var"',
+            'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
+          },
+        }
+
+
+        # Add the appropriate foss defaults to the host object so that they can be accessed using host[option], set host[:type] = foss
+        # @param [Host] host    A single host to act upon
+        # @param [String] platform The platform type of this host, one of windows, pswindows, freebsd, mac & unix
+        def add_platform_foss_defaults(host, platform)
+          FOSS_DEFAULTS[platform].each_pair do |key, val|
+            host[key] = val
+          end
+          # add the group and type for backwards compatability 
+          if host['platform'] =~ /windows/
+            host['group'] = 'Administrators'
+          else
+            host['group'] = 'puppet'
+          end
+          host['type'] = 'foss'
+        end
+
+        # Add the appropriate foss defaults to an array of hosts
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        def add_foss_defaults_on(hosts)
+          block_on hosts do | host |
+            case host.class.to_s.downcase
+            when /aix|unix/
+              platform = 'unix'
+            when /freebsd/
+              platform = 'freebsd'
+            when /mac/
+              platform = 'mac'
+            when /pswindows/
+              platform = 'pswindows'
+            else
+              platform = 'windows'
+            end
+            add_platform_foss_defaults(host, platform)
+          end
+        end
+
+        # Remove the appropriate foss defaults from the host object so that they can no longer be accessed using host[option], set host[:type] = nil
+        # @param [Host] host    A single host to act upon
+        # @param [String] platform The platform type of this host, one of windows, pswindows, freebsd, mac & unix
+        def remove_platform_foss_defaults(host, platform)
+          PE_DEFAULTS[platform].each_pair do |key, val|
+            host.delete(key)
+          end
+          host['group'] = nil
+          host['type'] = nil
+        end
+
+        # Remove the appropriate foss defaults from an array of hosts
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        def remove_foss_defaults_on(hosts)
+          block_on hosts do | host |
+            case host.class.to_s.downcase
+            when /aix|unix/
+              platform = 'unix'
+            when /freebsd/
+              platform = 'freebsd'
+            when /mac/
+              platform = 'mac'
+            when /pswindows/
+              platform = 'pswindows'
+            else
+              platform = 'windows'
+            end
+            remove_platform_foss_defaults(host, platform)
+          end
+        end
+
+      end
+    end
+  end
+end
+