Merge pull request #106 from chef-cookbooks/jtimberman/use-ingredient…

…s-fqdn-resolves Fixes #105, move the fqdn_resolves method
chef-cookbooks · Aug 31, 2015 · a020029 · a020029
2 parents 1eb13c0 + 9579aab
commit a020029
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -8,11 +8,9 @@ def api_fqdn_available?
     end
 
     def api_fqdn_resolves?
-      require 'resolv'
-      Resolv.getaddress(node['chef-server']['api_fqdn'])
-      return true
-    rescue
-      false
+      ChefIngredientCookbook::Helpers.fqdn_resolves?(
+        node['chef-server']['api_fqdn']
+      )
     end
 
     def repair_api_fqdn

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -16,7 +16,6 @@
 
 cache_path = Chef::Config[:file_cache_path]
 
-# see helpers.rb
 ruby_block 'ensure node can resolve API FQDN' do
   extend ChefServerCookbook::Helpers
   block { repair_api_fqdn }