Skip to content
This repository has been archived by the owner on Aug 25, 2021. It is now read-only.

Commit

Permalink
Merge pull request oswaldlabs#18 from simplymeasured/default-to-fqdn-…
Browse files Browse the repository at this point in the history
…for-node-name

default node_name to fqdn
  • Loading branch information
Brian Scott committed Aug 16, 2013
2 parents 98f30dd + e1a24b2 commit ecf4833
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions lib/chef-rundeck.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion spec/chef-rundeck_spec.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ecf4833

Please sign in to comment.