diff --git a/lib/facter/extlib__puppet_config.rb b/lib/facter/extlib__puppet_config.rb index 74254b5..e7366a1 100644 --- a/lib/facter/extlib__puppet_config.rb +++ b/lib/facter/extlib__puppet_config.rb @@ -1,39 +1,32 @@ Facter.add(:extlib__puppet_config) do setcode do puppet_config = {} desired_settings = { master: [ :localcacert, :ssldir ], main: [ :hostpubkey, :hostprivkey, :hostcert, :localcacert, :ssldir, :vardir, :server ] } desired_settings.each_pair do |section, settings| settings.each do |setting| puppet_config[section.to_s] = {} unless puppet_config.key?(section.to_s) puppet_config[section.to_s][setting.to_s] = Puppet.settings.values( Puppet[:environment].to_sym, section ).interpolate(setting) end end puppet_config end end - -# Facter 4 namespaced version -Facter.add(:'extlib.puppet_config') do - setcode do - Facter.value(:extlib__puppet_config) - end -end diff --git a/spec/unit/facter/extlib__puppet_config_spec.rb b/spec/unit/facter/extlib__puppet_config_spec.rb index 868e9f4..4a6678f 100644 --- a/spec/unit/facter/extlib__puppet_config_spec.rb +++ b/spec/unit/facter/extlib__puppet_config_spec.rb @@ -1,31 +1,25 @@ require 'spec_helper' require 'puppet' describe 'extlib__puppet_config fact' do let(:hostname) { Puppet[:certname] } let(:settings) do { 'main' => { 'hostcert' => "/dev/null/ssl/certs/#{hostname}.pem", 'hostprivkey' => "/dev/null/ssl/private_keys/#{hostname}.pem", 'hostpubkey' => "/dev/null/ssl/public_keys/#{hostname}.pem", 'localcacert' => '/dev/null/ssl/certs/ca.pem', 'server' => 'puppet', 'ssldir' => '/dev/null/ssl', 'vardir' => '/dev/null' }, 'master' => { 'localcacert' => '/dev/null/ssl/certs/ca.pem', 'ssldir' => '/dev/null/ssl' } } end it { expect(Facter.fact(:extlib__puppet_config).value).to eq(settings) } - - if Gem::Version.new(Gem.loaded_specs['facter'].version) >= Gem::Version.new('4') - it 'is also available under the toplevel `extlib` structured fact' do - expect(Facter.fact(:extlib).value).to include('puppet_config' => settings) - end - end end