lib/beaker/dsl/install_utils/foss_defaults.rb in beaker-2.14.1 vs lib/beaker/dsl/install_utils/foss_defaults.rb in beaker-2.15.0

- old
+ new

@@ -4,10 +4,20 @@ # # 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', @@ -126,10 +136,10 @@ # 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| + FOSS_DEFAULTS[platform].each_pair do |key, val| host.delete(key) end host['group'] = nil host['type'] = nil end