Revert "Misc fixes"
This reverts commit f40a4669b9
.
Change-Id: Ife8ce72ce76482671120d139305c900aec20d0b6
This commit is contained in:
parent
f40a4669b9
commit
804ed6db60
1
Gemfile
1
Gemfile
|
@ -11,7 +11,6 @@ group :development, :test do
|
|||
gem 'colorize'
|
||||
gem 'parallel'
|
||||
gem 'openstack'
|
||||
gem 'activesupport', '< 5.0.0'
|
||||
end
|
||||
|
||||
if ENV['PUPPET_GEM_VERSION']
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
require 'yaml'
|
||||
require 'active_support/core_ext/hash/indifferent_access'
|
||||
|
||||
module Noop
|
||||
class Task
|
||||
|
@ -71,9 +70,9 @@ module Noop
|
|||
facts_data[:puppetversion] = Puppet.version
|
||||
end
|
||||
|
||||
# @return [ActiveSupport::HashWithIndifferentAccess]
|
||||
# @return [Hash]
|
||||
def facts_data
|
||||
facts_data = ActiveSupport::HashWithIndifferentAccess.new
|
||||
facts_data = {}
|
||||
facts_hierarchy.each do |file_path|
|
||||
begin
|
||||
file_data = YAML.load_file file_path
|
||||
|
|
|
@ -35,7 +35,7 @@ Facts hierarchy:
|
|||
gem = gem.to_s
|
||||
return unless Object.const_defined? 'Gem'
|
||||
return unless Gem.loaded_specs.is_a? Hash
|
||||
return unless Gem.loaded_specs[gem].respond_to? :version
|
||||
return unless Gem.loaded_specs[gem].is_a? Gem::Specification
|
||||
Gem.loaded_specs[gem].version
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue