Skip to content

Commit

Permalink
Update module-data to b2a2bec34005004bfecb6d258d8e3c4c82abc860
Browse files Browse the repository at this point in the history
b2a2bec34005004bfecb6d258d8e3c4c82abc860 Merge pull request redhat-openstack#23 from tamarintech/bugfix/fallback_without_environment
90a488734f28a24507dc815f0cb9d832c9795635 Refactor to remove extra carriage return
f909b48d912a7c114400230347b375866c51e977 Allow fallback to Puppet::Module.find when find with environment fails.  Enables easier development (ex: when modulepath is specified on the command line).

Change-Id: Ib2fe6a1f4c0020cc311d32dc0fad5cd4d048c179
  • Loading branch information
xbezdick committed Jun 19, 2015
1 parent 1fdf8af commit 7b59ff6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ mod 'module-collectd',
:git => 'https://github.com/pdxcat/puppet-module-collectd.git'

mod 'module-data',
:commit => '0eead7f411f404b0a9a73bb161aac46c9fbe3219',
:commit => 'b2a2bec34005004bfecb6d258d8e3c4c82abc860',
:git => 'https://github.com/ripienaar/puppet-module-data.git'

mod 'mongodb',
Expand Down
2 changes: 1 addition & 1 deletion module-data/lib/hiera/backend/module_data_backend.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def initialize(cache=nil)
def load_module_config(module_name, environment)
default_config = {:hierarchy => ["common"]}

mod = Puppet::Module.find(module_name, environment)
mod = Puppet::Module.find(module_name) unless Puppet::Module.find(module_name, environment)

return default_config unless mod

Expand Down

0 comments on commit 7b59ff6

Please sign in to comment.