Merge pull request #28 from joshcooper/HC-46-confine-by-provider-feature

(HC-46) Confine provider based on hocon feature
puppetlabs · Feb 10, 2016 · 46bd9af · 46bd9af
2 parents 7c49628 + 36c593e
commit 46bd9af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/puppet/feature/hocon.rb b/lib/puppet/feature/hocon.rb
@@ -1,4 +1,9 @@
 require 'puppet/util/feature'
 
-Puppet.features.add(:hocon, :libs => ['hocon'])
+libs = ['hocon',
+        'hocon/config_factory',
+        'hocon/config_value_factory',
+        'hocon/parser/config_document_factory'
+       ]
 
+Puppet.features.add(:hocon, :libs => libs)
diff --git a/lib/puppet/provider/hocon_setting/ruby.rb b/lib/puppet/provider/hocon_setting/ruby.rb
@@ -1,11 +1,6 @@
-require 'puppet/util/feature'
-if Puppet.features.hocon?
-  require 'hocon/config_factory'
-  require 'hocon/parser/config_document_factory'
-  require 'hocon/config_value_factory'
-end
-
 Puppet::Type.type(:hocon_setting).provide(:ruby) do
+  confine :feature => :hocon
+
   def self.namevar(section_name, setting)
     "#{setting}"
   end