lib/r10k/source/hash.rb in r10k-3.9.0 vs lib/r10k/source/hash.rb in r10k-3.9.1
- old
+ new
@@ -118,12 +118,10 @@
# INFO -> Deploying Puppetfile content /etc/puppetlabs/code/environments/production/modules/bolt_shim
# INFO -> Deploying Puppetfile content /etc/puppetlabs/code/environments/production/modules/apply_helpers
#
class R10K::Source::Hash < R10K::Source::Base
- include R10K::Logging
-
# @param hash [Hash] A hash to validate.
# @return [Boolean] False if the hash is obviously invalid. A true return
# means _maybe_ it's valid.
def self.valid_environments_hash?(hash)
# TODO: more robust schema valiation
@@ -168,10 +166,10 @@
@environments_hash ||= set_environments_hash(@options.fetch(:environments, {}))
end
def environments
@environments ||= environments_hash.map do |name, hash|
- R10K::Environment.from_hash(name, hash)
+ R10K::Environment.from_hash(name, hash.merge({overrides: @options[:overrides]}))
end
end
# List all environments that should exist in the basedir for this source
# @note This is required by {R10K::Util::Basedir}