beaker-puppet 0.1.0

data/lib/beaker-puppet/helpers/tk_helpers.rb

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+require 'hocon'
+require 'hocon/config_error'
+require 'inifile'
+
+module Beaker
+  module DSL
+    module Helpers
+      # Convenience methods for modifying and reading TrapperKeeper configs
+      module TKHelpers
+
+        # Modify the given TrapperKeeper config file.
+        #
+        # @param [Host] host  A host object
+        # @param [OptionsHash] options_hash  New hash which will be merged into
+        #                                    the given TrapperKeeper config.
+        # @param [String] config_file_path  Path to the TrapperKeeper config on
+        #                                   the given host which is to be
+        #                                   modified.
+        # @param [Bool] replace  If set true, instead of updating the existing
+        #                        TrapperKeeper configuration, replace it entirely
+        #                        with the contents of the given hash.
+        #
+        # @note TrapperKeeper config files can be HOCON, JSON, or Ini. We don't
+        # particularly care which of these the file named by `config_file_path` on
+        # the SUT actually is, just that the contents can be parsed into a map.
+        #
+        def modify_tk_config(host, config_file_path, options_hash, replace=false)
+          if options_hash.empty?
+            return nil
+          end
+
+          new_hash = Beaker::Options::OptionsHash.new
+
+          if replace
+            new_hash.merge!(options_hash)
+          else
+            if not host.file_exist?( config_file_path )
+              raise "Error: #{config_file_path} does not exist on #{host}"
+            end
+            file_string = host.exec( Command.new( "cat #{config_file_path}" )).stdout
+
+            begin
+              tk_conf_hash = read_tk_config_string(file_string)
+            rescue RuntimeError
+              raise "Error reading trapperkeeper config: #{config_file_path} at host: #{host}"
+            end
+
+            new_hash.merge!(tk_conf_hash)
+            new_hash.merge!(options_hash)
+          end
+
+          file_string = JSON.pretty_generate(new_hash)
+          create_remote_file host, config_file_path, file_string
+        end
+
+        # The Trapperkeeper config service will accept HOCON (aka typesafe), JSON,
+        # or Ini configuration files which means we need to safely handle the the
+        # exceptions that might come from parsing the given string with the wrong
+        # parser and fall back to the next valid parser in turn. We finally raise
+        # a RuntimeException if none of the parsers succeed.
+        #
+        # @!visibility private
+        def read_tk_config_string( string )
+            begin
+              return Hocon.parse(string)
+            rescue Hocon::ConfigError
+              nil
+            end
+
+            begin
+              return JSON.parse(string)
+            rescue JSON::JSONError
+              nil
+            end
+
+            begin
+              return IniFile.new(content: string)
+            rescue IniFile::Error
+              nil
+            end
+
+            raise "Failed to read TrapperKeeper config!"
+        end
+      end
+
+    end
+  end
+end

data/lib/beaker-puppet/install_utils/aio_defaults.rb

@@ -0,0 +1,93 @@
+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)
+          },
+          'pwindows' => { #pure windows
+            'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
+            'privatebindir'     => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\sys\\ruby\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin"',
+            'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
+          }
+        }
+
+        # 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
+        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.is_powershell?
+              platform = 'pwindows'
+            elsif 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['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.is_powershell?
+              platform = 'pswindows'
+            elsif host['platform'] =~ /windows/
+              platform = 'windows'
+            else
+              platform = 'unix'
+            end
+            remove_platform_aio_defaults(host, platform)
+          end
+        end
+
+
+      end
+    end
+  end
+end
+

data/lib/beaker-puppet/install_utils/ezbake_utils.rb

@@ -0,0 +1,256 @@
+require 'fileutils'
+
+module Beaker
+  module DSL
+    module InstallUtils
+      # This module contains methods to assist in installing projects from source
+      # that use ezbake for packaging.
+      #
+      module EZBakeUtils
+
+        # @!group Public DSL Methods
+
+        # Installs leiningen project with given name and version on remote host.
+        #
+        # @param [Host] host A single remote host on which to install the
+        #   specified leiningen project.
+        def install_from_ezbake host
+          ezbake_validate_support host
+          ezbake_tools_available?
+          install_ezbake_tarball_on_host host
+          ezbake_installsh host, "service"
+        end
+
+        # Installs termini with given name and version on remote host.
+        #
+        # @param [Host] host A single remote host on which to install the
+        #   specified leiningen project.
+        def install_termini_from_ezbake host
+          ezbake_validate_support host
+          ezbake_tools_available?
+          install_ezbake_tarball_on_host host
+          ezbake_installsh host, "termini"
+        end
+
+        # Install a development version of ezbake into the local m2 repository
+        #
+        # This can be useful if you want to work on a development branch of
+        # ezbake that hasn't been released yet. Ensure your project dependencies
+        # in your development branch include a reference to the -SNAPSHOT
+        # version of the project for it to successfully pickup a pre-shipped
+        # version of ezbake.
+        #
+        # @param url [String] git url
+        # @param branch [String] git branch
+        def ezbake_dev_build url = "git@github.com:puppetlabs/ezbake.git",
+                             branch = "master"
+          ezbake_dir = 'tmp/ezbake'
+          conditionally_clone url, ezbake_dir, branch
+          lp = ezbake_lein_prefix
+
+          Dir.chdir(ezbake_dir) do
+            ezbake_local_cmd "#{lp} install",
+                              :throw_on_failure => true
+          end
+        end
+
+        # @!endgroup
+
+        class << self
+          attr_accessor :config
+        end
+
+        # @!group Private helpers
+
+        # Test for support in one place
+        #
+        # @param [Host] host host to check for support
+        # @raise [RuntimeError] if OS is not supported
+        # @api private
+        def ezbake_validate_support host
+          variant, version, _, _ = host['platform'].to_array
+          unless variant =~ /^(fedora|el|centos|debian|ubuntu)$/
+            raise RuntimeError,
+                  "No support for #{variant} within ezbake_utils ..."
+          end
+        end
+
+        # Build, copy & unpack tarball on remote host
+        #
+        # @param [Host] host installation destination
+        # @api private
+        def install_ezbake_tarball_on_host host
+          if not ezbake_config
+            ezbake_stage
+          end
+
+          # Skip installation if the remote directory exists
+          result = on host, "test -d #{ezbake_install_dir}", :acceptable_exit_codes => [0, 1]
+          return if result.exit_code == 0
+
+          ezbake_staging_dir = File.join('target', 'staging')
+          Dir.chdir(ezbake_staging_dir) do
+            ezbake_local_cmd 'rake package:tar'
+          end
+
+          local_tarball = ezbake_staging_dir + "/pkg/" + ezbake_install_name + ".tar.gz"
+          remote_tarball = ezbake_install_dir + ".tar.gz"
+          scp_to host, local_tarball, remote_tarball
+
+          # untar tarball on host
+          on host, "tar -xzf " + remote_tarball
+
+          # Check to ensure directory exists
+          on host, "test -d #{ezbake_install_dir}"
+        end
+
+        LOCAL_COMMANDS_REQUIRED = [
+          ['leiningen', 'lein --version', nil],
+          ['lein-pprint', 'lein with-profile ci pprint :version',
+            'Must have lein-pprint installed under the :ci profile.'],
+          ['java', 'java -version', nil],
+          ['git', 'git --version', nil],
+          ['rake', 'rake --version', nil],
+        ]
+
+        # Checks given host for the tools necessary to perform
+        # install_from_ezbake.
+        #
+        # @raise [RuntimeError] if tool is not found
+        # @api private
+        def ezbake_tools_available?
+          LOCAL_COMMANDS_REQUIRED.each do |software_name, command, additional_error_message|
+            if not system command
+              error_message = "Must have #{software_name} installed on development system.\n"
+              if additional_error_message
+                error_message += additional_error_message
+              end
+              raise RuntimeError, error_message
+            end
+          end
+        end
+
+        # Return the ezbake config.
+        #
+        # @return [Hash] configuration for ezbake, usually from ezbake.rb
+        # @api private
+        def ezbake_config
+          EZBakeUtils.config
+        end
+
+        # Returns a leiningen prefix with local m2 repo capability
+        #
+        # @return [String] lein prefix command that uses a local build
+        #   m2 repository.
+        # @api private
+        def ezbake_lein_prefix
+          # Get the absolute path to the local repo
+          m2_repo = File.join(Dir.pwd, 'tmp', 'm2-local')
+
+          'lein update-in : assoc :local-repo "\"' + m2_repo + '\"" --'
+        end
+
+        # Prepares a staging directory for the specified project.
+        #
+        # @api private
+        def ezbake_stage
+          # Install the PuppetDB jar into the local repository
+          ezbake_local_cmd "#{ezbake_lein_prefix} install",
+                           :throw_on_failure => true
+
+          # Run ezbake stage
+          ezbake_local_cmd "#{ezbake_lein_prefix} with-profile ezbake ezbake stage",
+                           :throw_on_failure => true
+
+          # Boostrap packaging, and grab configuration info from project
+          staging_dir = File.join('target','staging')
+          Dir.chdir(staging_dir) do
+            ezbake_local_cmd 'rake package:bootstrap'
+
+            load 'ezbake.rb'
+            ezbake = EZBake::Config
+            ezbake[:package_version] = `printf $(rake pl:print_build_param[ref] | tail -n 1)`
+            EZBakeUtils.config = ezbake
+          end
+        end
+
+        # Executes a local command using system, logging the prepared command
+        #
+        # @param [String] cmd command to execute
+        # @param [Hash] opts options
+        # @option opts [bool] :throw_on_failure If true, throws an
+        #   exception if the exit code is non-zero. Defaults to false.
+        # @return [bool] true if exit == 0 false if otherwise
+        # @raise [RuntimeError] if :throw_on_failure is true and
+        #   command fails
+        # @api private
+        def ezbake_local_cmd cmd, opts={}
+          opts = {
+            :throw_on_failure => false,
+          }.merge(opts)
+
+          logger.notify "localhost $ #{cmd}"
+          result = system cmd
+          if opts[:throw_on_failure] && result == false
+            raise RuntimeError, "Command failure #{cmd}"
+          end
+          result
+        end
+
+        # Retrieve the tarball installation name. This is the name of
+        # the tarball without the .tar.gz extension, and the name of the
+        # path where it will unpack to.
+        #
+        # @return [String] name of the tarball and directory
+        # @api private
+        def ezbake_install_name
+          ezbake = ezbake_config
+          project_package_version = ezbake[:package_version]
+          project_name = ezbake[:project]
+          "%s-%s" % [ project_name, project_package_version ]
+        end
+
+        # Returns the full path to the installed software on the remote host.
+        #
+        # This only returns the path, it doesn't work out if its installed or
+        # not.
+        #
+        # @return [String] path to the installation dir
+        # @api private
+        def ezbake_install_dir
+          "/root/#{ezbake_install_name}"
+        end
+
+        # A helper that wraps the execution of install.sh in the proper
+        # ezbake installation directory.
+        #
+        # @param [Host] host Host to run install.sh on
+        # @param [String] task Task to execute with install.sh
+        # @api private
+        def ezbake_installsh host, task=""
+          on host, "cd #{ezbake_install_dir}; bash install.sh #{task}"
+        end
+
+        # Only clone from given git URI if there is no existing git clone at the
+        # given local_path location.
+        #
+        # @param [String] upstream_uri git URI
+        # @param [String] local_path path to conditionally install to
+        # @param [String] branch to checkout
+        # @api private
+        def conditionally_clone upstream_uri, local_path, branch="origin/HEAD"
+          if ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git status"
+            ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git fetch origin"
+            ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git checkout #{branch}"
+          else
+            parent_dir = File.dirname(local_path)
+            FileUtils.mkdir_p(parent_dir)
+            ezbake_local_cmd "git clone #{upstream_uri} #{local_path}"
+            ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git checkout #{branch}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/beaker-puppet/install_utils/foss_defaults.rb

@@ -0,0 +1,211 @@
+module Beaker
+  module DSL
+    module InstallUtils
+      #
+      # This module contains default values for FOSS puppet paths and directorys per-platform
+      #
+      module FOSSDefaults
+
+        #Here be the default download URLs
+        FOSS_DEFAULT_DOWNLOAD_URLS = {
+          :win_download_url       => "http://downloads.puppetlabs.com/windows",
+          :mac_download_url       => "http://downloads.puppetlabs.com/mac",
+          :pe_promoted_builds_url => "http://pm.puppetlabs.com",
+          :release_apt_repo_url   => "http://apt.puppetlabs.com",
+          :release_yum_repo_url   => "http://yum.puppetlabs.com",
+          :dev_builds_url         => "http://builds.delivery.puppetlabs.net",
+        }
+
+        #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',
+          },
+          'openbsd' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppet/modules',
+            'puppetvardir'      => '/var/puppet',
+            'puppetbin'         => '/usr/local/bin/puppet',
+            'puppetbindir'      => '/usr/local/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/local/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',
+          },
+          'archlinux' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppetlabs/puppet',
+            'puppetconfdir'     => '/etc/puppetlabs/puppet',
+            'puppetvardir'      => '/opt/puppetlabs/puppet/cache',
+            'puppetbin'         => '/usr/bin/puppet',
+            'puppetbindir'      => '/usr/bin',
+            'privatebindir'     => '/usr/bin',
+            'hieralibdir'       => '/var/lib/hiera',
+            'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
+            'hierabindir'       => '/usr/bin',
+            'hieradatadir'      => '/etc/puppetlabs/code/hiera',
+            'hieraconf'         => '/etc/hiera.yaml',
+            'distmoduledir'     => '/etc/puppetlabs/code/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 /openbsd/
+              platform = 'openbsd'
+            when /mac/
+              platform = 'mac'
+            when /pswindows/
+              platform = 'pswindows'
+            when /archlinux/
+              platform = 'archlinux'
+            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)
+          FOSS_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 /openbsd/
+              platform = 'openbsd'
+            when /mac/
+              platform = 'mac'
+            when /pswindows/
+              platform = 'pswindows'
+            else
+              platform = 'windows'
+            end
+            remove_platform_foss_defaults(host, platform)
+          end
+        end
+
+      end
+    end
+  end
+end
+