Merge pull request #18 from simplymeasured/default-to-fqdn-for-node-name

default node_name to fqdn
oswaldlabs · Aug 16, 2013 · 0e32577 · 0e32577
2 parents 41d64e6 + ded70fb
commit 0e32577
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/chef-rundeck.rb b/lib/chef-rundeck.rb
@@ -30,6 +30,9 @@ class << self
 
     def configure
       Chef::Config.from_file(ChefRundeck.config_file)
+      client = Chef::Client.new
+      client.run_ohai
+      client.register
       Chef::Log.level = Chef::Config[:log_level]
     end
   end

diff --git a/spec/chef-rundeck_spec.rb b/spec/chef-rundeck_spec.rb
@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe 'ChefRundeck' do
-  ChefRundeck.config_file = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/client.rb"
   it 'should return false' do
+    ChefRundeck.config_file = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/client.rb"
+    ChefRundeck.username = ENV['USER']
+    ChefRundeck.web_ui_url = 'https://manage.opscode.com'
+    ChefRundeck.configure
+
     get '/' 
     last_response.should be_ok
   end