toft 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toft (0.0.2)
+    toft (0.0.3)
       net-ssh
 
 GEM
@@ -18,6 +18,8 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.9)
+    fpm (0.3.10)
+      json
     gherkin (2.5.1)
       json (>= 1.4.6)
     i18n (0.6.0)
@@ -25,6 +27,7 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
+    rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -52,6 +55,8 @@ PLATFORMS
 
 DEPENDENCIES
   cucumber
+  fpm
+  rake
   rspec
   toft!
   vagrant (>= 0.8.7)

data/Rakefile

@@ -1,14 +1,103 @@
 require "bundler/gem_tasks"
 
+PROJECT_ROOT = File.dirname(__FILE__)
+LXC_PACKAGE_NAME = "toft-lxc"
+
 desc "clean artifacts"
 task :clean do
   `rm -rf pkg`
+  `rm -rf tmp`
 end
 
 desc "build gem and scripts package"
-task :package => [:build, :package_scripts]
+task :package => [:build, :package_deb, :package_rpm]
+
+task :package_deb do
+  src_dir = "#{PROJECT_ROOT}/scripts"
+  content_dir = "#{PROJECT_ROOT}/pkg/#{LXC_PACKAGE_NAME}"
+  mkdir_p content_dir
+  mkdir_p "#{content_dir}/usr/local/bin"
+  mkdir_p "#{content_dir}/var/cache/lxc"
+  mkdir_p "#{content_dir}/usr/lib/lxc/templates"
+  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/bin/ubuntu/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/lxc-templates/*"), "#{content_dir}/usr/lib/lxc/templates"
+  
+  post_install_script = <<-eos
+#!/bin/sh -e
+/usr/local/bin/lxc-prepare-host
+eos
+  File.open("#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh", 'w') { |f| f.write(post_install_script) }
+  
+  Dir.chdir("pkg") do
+    system <<-EOF
+    fpm -s dir \
+    -t deb \
+    -C #{content_dir} \
+    -a all \
+    -n #{LXC_PACKAGE_NAME} \
+    -v #{Toft::VERSION} \
+    -m "Huang Liang<exceedhl@gmail.com>" \
+    --description "lxc templates and helper provided by toft" \
+    -d rpm \
+    -d dnsutils \
+    -d lxc \
+    -d bridge-utils \
+    -d debootstrap \
+    -d dhcp3-server \
+    -d bind9 \
+    -d ntp \
+    --replaces lxc \
+    --conflicts apparmor \
+    --conflicts apparmor-utils \
+    --post-install "#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh" \
+    .
+    EOF
+  end
+end
+
+task :package_rpm do
+  src_dir = "#{PROJECT_ROOT}/scripts"
+  content_dir = "#{PROJECT_ROOT}/pkg/#{LXC_PACKAGE_NAME}"
+  mkdir_p content_dir
+  mkdir_p "#{content_dir}/usr/local/bin"
+  mkdir_p "#{content_dir}/usr/var/lib/lxc"
+  mkdir_p "#{content_dir}/var/cache/lxc"
+  mkdir_p "#{content_dir}/usr/lib/lxc/templates"
+  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/bin/centos/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/lxc-templates/*"), "#{content_dir}/usr/lib/lxc/templates"
+  
+  post_install_script = <<-eos
+#!/bin/sh -e
+/usr/local/bin/lxc-prepare-host
+eos
+  File.open("#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh", 'w') { |f| f.write(post_install_script) }
+  
+  Dir.chdir("pkg") do
+    system <<-EOF
+    fpm -s dir \
+    -t rpm \
+    -C #{content_dir} \
+    -a all \
+    -n #{LXC_PACKAGE_NAME} \
+    -v #{Toft::VERSION} \
+    -m "Huang Liang<exceedhl@gmail.com>" \
+    --description "lxc templates and helper provided by toft" \
+    -d bind-utils \
+    -d bridge-utils \
+    -d dhcp \
+    -d bind \
+    -d ntp \
+    -d libcap-devel \
+    --post-install "#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh" \
+    .
+    EOF
+  end
+end
 
-task :package_scripts do
-  mkdir_p "pkg"
-  `tar zcf pkg/toft_ubuntu_scripts-#{Toft::VERSION}.tar.gz scripts/ubuntu`
+desc "run all tests and features"
+task :test do
+  `rspec spec`
+  `sudo cucumber features`
 end

data/features/checker.feature

@@ -1,13 +1,13 @@
 Feature: Checkers provided by Toft to help you verify system state
 
 Scenario: Dir checker
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then Node "n1" should have "directory" "/tmp" owned by user "root" and group "root" with permission "1777"
 	Then Node "n1" should have not file or directory "/non-exist-dir"
 	Then Node "n1" should have file or directory "tmp"
 	
 Scenario: File checker
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When Running ssh command "if getent passwd n1; then userdel -fr n1; fi; useradd -m n1" on "n1" should succeed
 	And Running ssh command "sudo -u n1 touch /tmp/a" on "n1" should succeed
 	Then Node "n1" should have file or directory "/tmp/a"

data/features/chef.feature

@@ -1,12 +1,12 @@
 Feature: Chef support
 
 Scenario: Run chef recipe on nodes 
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When I run "recipe[test]" on node "n1"
 	Then Node "n1" should have file or directory "/tmp/stub/dir"
 
 Scenario: Run chef recipe with attributes
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When I run "recipe[test::attribute]" on node "n1" and overwrite attributes with:
 		|key|value|
 		|one|one|
@@ -19,7 +19,7 @@ Scenario: Run chef recipe with attributes
 	Then Node "n1" should have file or directory "/tmp/stub/three"
 	
 Scenario: Run multiple chef recipes
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When I run recipes on node "n1":
 		|recipe|
 		|recipe[test::role]|
@@ -28,16 +28,34 @@ Scenario: Run multiple chef recipes
 	Then Node "n1" should have file or directory "/tmp/stub/role"
 
 Scenario: Run chef role
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When I run "role[test]" on node "n1"
 	Then Node "n1" should have file or directory "/tmp/stub/role"
 
 Scenario: Toft should not deal with empty cookbook and role path
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	When I set the role path to empty
 	Then Running chef "recipe[test]" on node "n1" should succeed
 	When I set the cookbook path to empty
 	Then Running chef "recipe[test]" on node "n1" should fail
+	
+Scenario: Run chef recipe with json attributes file
+	Given I have a clean running node n1
+	When I run "recipe[test::attribute]" on node "n1" and overwrite attributes with json file "attributes.json"
+	Then Node "n1" should have file or directory "/tmp/stub/one"
+	Then Node "n1" should have file or directory "/tmp/stub/two_one"
+	Then Node "n1" should have file or directory "/tmp/stub/two_two"
+	Then Node "n1" should have file or directory "/tmp/stub/three"
+
+Scenario: Attributes table should override attributes in json file
+	Given I have a clean running node n1
+	When I run "recipe[test::attribute]" on node "n1" and overwrite attributes with json file "attributes.json" and chef attributes:
+		|key|value|
+		|one|override|
+	Then Node "n1" should have file or directory "/tmp/stub/override"
+	Then Node "n1" should have file or directory "/tmp/stub/two_one"
+	Then Node "n1" should have file or directory "/tmp/stub/two_two"
+	Then Node "n1" should have file or directory "/tmp/stub/three"
 
 Scenario: Run non-exist recipe
 

data/features/command.feature

@@ -1,19 +1,20 @@
 Feature: Run ssh command on node
 
 Scenario: Run command on node successfully
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then Running ssh command "" on "n1" should fail
 	And Running ssh command "ps" on "n1" should succeed
 	And Running ssh command "non-exist-command" on "n1" should fail
 	And Running ssh command "netstat -nr" on "n1" should succeed
 	
 Scenario: Test rm
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then Rm "" on "n1" should fail
 	And Rm "tmp/*" on "n1" should fail
 	And Rm "/tmp/*" on "n1" should succeed
 	
 Scenario: Check ssh command result
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then the result of running ssh command "ps" on "n1" should contain "sshd"
+	Then the result of running ssh command "chef-solo" on "n1" should contain "No cookbook found"
 	

data/features/node.feature

@@ -1,21 +1,36 @@
 Feature: Node management
 
 Scenario: Start or stop node
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then the node "n1" should be running
 	When I stop node "n1"
 	Then the node "n1" should be stopped
 	When I start node "n1"
 	Then the node "n1" should be running
+	
+Scenario: Add and remove cnames for a node
+	Given I have a clean running node n1
+	And I add another node "n2"
+	When I add cname "cn1" to "n1"
+	Then Running ssh command "ping -c 1 cn1" on "n2" should succeed	
+	When I remove cname "cn1" from "n1"
+	Then Running ssh command "ping -c 1 cn1" on "n2" should fail
+	And Node "n2" is destroyed
 
+Scenario: Create node only by name and fetch their info
+	Given I have a clean running node n1
+	When I add another node "n3"
+	Then Running ssh command "ping -c 1 n1" on "n3" should succeed
+	And Running ssh command "ping -c 1 n3" on "n1" should succeed
+	And Node "n1" should have ip address same with that obtained from inside it through ssh
+	And Node "n3" should have ip address same with that obtained from inside it through ssh
+	And Node "n3" is destroyed
+	
 Scenario: Create or destroy node 
-	Given I have a clean running node "n1" with ip "192.168.20.2"
+	Given I have a clean running node n1
 	Then There should be 1 nodes in the environment
 	When I add another node "n2" with ip "192.168.20.3"
 	Then There should be 2 nodes in the environment
 	When I destroy node "n2"
-	Then There should be 1 nodes in the environment
-	When Node "n1" is destroyed
-	Then There should be 0 nodes in the environment	
+	Then There should be 1 nodes in the environment	
 	
-	

data/features/step_definitions/chef.rb

@@ -7,11 +7,11 @@ When /^I run recipes on node "([^"]*)":$/ do |node, recipes_table|
   recipes_table.hashes.each do |row|
     recipes << row[:recipe]
   end
-  find(node).run_chef recipes  
+  find(node).run_chef recipes
 end
 
 When /^I run "([^"]*)" on node "([^"]*)" and overwrite attributes with:$/ do |run_list, node, table|
-  find(node).run_chef run_list, Toft::ChefAttributes.new(table)
+  find(node).run_chef run_list, {:attributes => Toft::ChefAttributes.new(table)}
 end
 
 When /^I set the role path to empty$/ do
@@ -32,4 +32,12 @@ end
 
 Then /^Running chef "([^"]*)" on node "([^"]*)" should fail$/ do |run_list, node|
   lambda { find(node).run_chef(run_list) }.should raise_error
-end
+end
+
+When /^I run "([^"]*)" on node "([^"]*)" and overwrite attributes with json file "([^"]*)"$/ do |run_list, node, json_file|
+  find(node).run_chef run_list, :json => CHEF_FIXTURE_PATH + '/attributes.json'
+end
+
+When /^I run "([^"]*)" on node "([^"]*)" and overwrite attributes with json file "([^"]*)" and chef attributes:$/ do |run_list, node, json_file, table|
+  find(node).run_chef run_list, {:json => CHEF_FIXTURE_PATH + '/attributes.json', :attributes => Toft::ChefAttributes.new(table)}
+end

data/features/step_definitions/command.rb

@@ -15,7 +15,5 @@ Then /^Rm "([^"]*)" on "([^"]*)" should succeed$/ do |dir, node|
 end
 
 Then /^the result of running ssh command "([^"]*)" on "([^"]*)" should contain "([^"]*)"$/ do |cmd, node, s|
-  find(node).run_ssh(cmd) do |output|
-    output.should include(s)
-  end
+  find(node).get_ssh_result(cmd).should include(s)
 end

data/features/step_definitions/node.rb

@@ -1,11 +1,15 @@
-Given /^I have a clean running node "([^"]*)" with ip "([^"]*)"$/ do |node, ip|
-  create_node node, ip, "centos-6"
+Given /^I have a clean running node n1$/ do
   @n1.start
   @n1.rm "/tmp/stub"
 end
 
 When /^I add another node "([^"]*)" with ip "([^"]*)"$/ do |node, ip|
-  create_node node, ip, "centos-6"
+  create_node node, {:ip => ip, :type => CONTAINER_TYPE}
+end
+
+When /^I add another node "([^"]*)"$/ do |node|
+  n = create_node node, {:type => CONTAINER_TYPE}
+  n.start
 end
 
 When /^I destroy node "([^"]*)"$/ do |node|
@@ -36,3 +40,15 @@ Then /^the node "([^"]*)" should be running$/ do |node|
   find(node).should be_running
 end
 
+Then /^Node "([^"]*)" should have ip address same with that obtained from inside it through ssh$/ do |node|
+  n = find(node)
+  n.get_ssh_result("ifconfig eth0 | grep 'inet addr:'").should include(n.ip)
+end
+
+When /^I add cname "([^"]*)" to "([^"]*)"$/ do |cname, node|
+  find(node).add_cname cname
+end
+
+When /^I remove cname "([^"]*)" from "([^"]*)"$/ do |cname, node|
+  find(node).remove_cname cname
+end

data/features/support/env.rb

@@ -2,15 +2,18 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'rspec/expectations'
 require 'toft'
 
-Toft.cookbook_path = File.dirname(__FILE__) + '/../../fixtures/chef/cookbooks'
-Toft.role_path = File.dirname(__FILE__) + '/../../fixtures/chef/roles'
+CHEF_FIXTURE_PATH = File.dirname(__FILE__) + '/../../fixtures/chef'
+CONTAINER_TYPE = "centos-6"
 
 World(Toft)
 
 include Toft
-n1 = create_node "n1", "192.168.20.2", "centos-6"
+n1 = create_node "n1", {:ip => "192.168.20.2", :type => CONTAINER_TYPE}
 
 Before do
+  Toft.cookbook_path = CHEF_FIXTURE_PATH + '/cookbooks'
+  Toft.role_path = CHEF_FIXTURE_PATH + '/roles'
+
   @n1 = n1
 end
 

data/fixtures/chef/attributes.json

@@ -0,0 +1,9 @@
+{
+	"one" : "one",
+	"two" : 
+	{
+		"one" : "two_one",
+		"two" : "two_two"
+	},
+	"three" : "three"
+}

data/lib/toft/chef/chef_attributes.rb

@@ -4,11 +4,11 @@ module Toft
   class ChefAttributes
     attr_reader :attributes
     
-    def initialize(cuke_ast_table)
+    def initialize(cuke_ast_table = nil)
       @attributes = {}
       cuke_ast_table.hashes.each do |row|
         add_attribute row[:key], row[:value]
-      end
+      end unless cuke_ast_table.nil?
     end
     
     def add_attribute(key, value)

data/lib/toft/chef/chef_runner.rb

@@ -17,15 +17,28 @@ module Toft
         @command_runner = command_runner
       end
 
-      def run(run_list, chef_attributes)
+      def run(run_list, params = {})
+        override_attributes_hash = parse_attributes params[:json], params[:attributes] 
         copy_chef_material
         generate_solo_rb
-        generate_json ([] << run_list).flatten, chef_attributes
+        generate_json ([] << run_list).flatten, override_attributes_hash
         @command_runner.call "chef-solo -c #{DEST_CHEF_SOLO_PATH} -j #{DEST_CHEF_JSON_PATH}"
       end
 
       private 
+      def parse_attributes(json_file_path, chef_attributes)
+        chef_attributes = chef_attributes || ChefAttributes.new
+        chef_attributes_from_json ||= {}
+        chef_attributes_from_json = read_json_file json_file_path unless json_file_path.blank?
+        chef_attributes_from_json.merge chef_attributes.attributes
+      end
+      
+      def read_json_file(json_file_path)
+        JSON.parse(File.read(json_file_path))
+      end
+    
       def copy_chef_material
+        raise ArgumentError, "Toft.cookbook_path can not be empty!" if Toft.cookbook_path.blank?
         rm_rf "#{@root_dir}#{DEST_CHEF_TMP}"  
         mkdir_p "#{@root_dir}#{DEST_CHEF_TMP}"
         cp_r Toft.cookbook_path, "#{@root_dir}#{DEST_COOKBOOK_PATH}"
@@ -48,9 +61,9 @@ cookbook_path ["#{DEST_COOKBOOK_PATH}"]
         end
       end
 
-      def generate_json(run_list, chef_attributes)
+      def generate_json(run_list, override_attributes_hash)
         run_list = {"run_list" => run_list}
-        run_list.merge!(chef_attributes.attributes) unless chef_attributes.nil?
+        run_list.merge!(override_attributes_hash)
         File.open("#{@root_dir}#{DEST_CHEF_JSON_PATH}", 'w') do |f|
           f.write(run_list.to_json);
         end

data/lib/toft/node.rb

@@ -35,14 +35,19 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
 -----END RSA PRIVATE KEY-----    
     EOF
     
+    TIMOUT_IN_SECONDS = 60
+    TRY_INTERVAL = 0.5
+    
     include Observable
 
-    def initialize(hostname, ip, type)
+    def initialize(hostname, options)
+      options = {:ip => DYNAMIC_IP, :netmask => "24", :type => "natty"}.merge(options)
       @hostname = hostname
-      @ip = ip
+      @ip = options[:ip]
+      @netmask = options[:netmask]
       unless exists?
         conf_file = generate_lxc_config
-        system "lxc-create -n #{hostname} -f #{conf_file} -t #{type.to_s}" 
+        system "lxc-create -n #{hostname} -f #{conf_file} -t #{options[:type].to_s}" 
       end
       @chef_runner = Toft::Chef::ChefRunner.new("#{rootfs}") do |chef_command|
         run_ssh chef_command
@@ -74,62 +79,97 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     def running?
       `lxc-info -n #{@hostname}` =~ /RUNNING/
     end
+    
+    def add_cname(cname)
+      run_ssh "echo -e 'update add #{cname}.#{Toft::DOMAIN} 86400 CNAME #{@hostname}.#{Toft::DOMAIN}\\nsend' | nsupdate"
+    end
+    
+    def remove_cname(cname)
+      run_ssh "echo -e 'update delete #{cname}.#{Toft::DOMAIN}\\nsend' | nsupdate"      
+    end
 
     def run_ssh(command)
       raise ArgumentError, "Trying to run empty command on node #{@hostname}", caller if command.blank?
-      output = ""
       error = false
-      Net::SSH.start(@ip, "root", :key_data => [PRIVATE_KEY]) do |ssh|
+      Net::SSH.start(fqdn, "root", :key_data => [PRIVATE_KEY]) do |ssh|
         ssh.exec! command do |ch, stream, data|
           if stream == :stderr
             error = true
           end
-          output += data
+          yield data if block_given?
+	        puts data
         end
       end
-      raise RuntimeError, output, caller if error
-      puts output
-      return yield output if block_given?
+      raise RuntimeError, "Error happened while executing command [#{command}]!", caller if error
       return true
     end
+    
+    def get_ssh_result(cmd)
+      output = ""
+      run_ssh(cmd) do |data|
+        output += data
+      end
+      return output
+    end
 
     def rm(dir)
       raise ArgumentError, "Illegal dir path: [#{dir}]", caller if dir.blank? || dir[0] != ?/
       system "rm -rf #{rootfs}#{dir}"
     end
 
-    def run_chef(run_list, chef_attributes = nil)
-      @chef_runner.run run_list, chef_attributes
+    def run_chef(run_list, params = {})
+      @chef_runner.run run_list, params
     end
 
     def file(path)
       FileChecker.new(rootfs, path)
     end
+    
+    def ip
+      @ip == Toft::DYNAMIC_IP ? `dig +short #{fqdn}`.strip : @ip
+    end
 
     private
     def rootfs
       "/var/lib/lxc/#{@hostname}/rootfs"
     end
-
-    def wait_ssh_ready
+    
+    def wait_sshd_running
       while true
         netstat = `lxc-netstat --name #{@hostname} -ta`        
-        break if netstat =~ /ssh/
+        return if netstat =~ /ssh/
       end
-      while true
-        break if Ping.pingecho @ip, 0.1
-        sleep 0.5
+    end
+    
+    def wait_remote_host_reachable
+      max_try = TIMOUT_IN_SECONDS / TRY_INTERVAL
+      try = 0
+      while try < max_try
+        begin
+          break if Ping.pingecho fqdn, 0.1
+        rescue Exception
+          # fix the strange pingcho exception
+        end
+        sleep TRY_INTERVAL
+        try += 1
       end
-      puts "SSH connection on #{@ip} is ready..."
+      raise RuntimeError, "Remote machine not responding." if try >= max_try
+    end
+
+    def wait_ssh_ready
+      wait_sshd_running
+      wait_remote_host_reachable
+      puts "SSH connection on '#{@hostname}/#{@ip}' is ready..."
     end
 
     def generate_lxc_config
+      full_ip = @ip == Toft::DYNAMIC_IP ? "#{@ip}" : "#{@ip}/#{@netmask}"
       conf = <<-EOF
 lxc.network.type = veth
 lxc.network.flags = up
 lxc.network.link = br0
 lxc.network.name = eth0
-lxc.network.ipv4 = #{@ip}/24
+lxc.network.ipv4 = #{full_ip}
       EOF
       conf_file = "/tmp/#{@hostname}-conf"
       File.open(conf_file, 'w') do |f|
@@ -137,5 +177,9 @@ lxc.network.ipv4 = #{@ip}/24
       end
       return conf_file
     end
+    
+    def fqdn
+      "#{@hostname}.#{Toft::DOMAIN}"
+    end
   end
-end
+end

data/lib/toft/node_controller.rb

@@ -8,8 +8,8 @@ module Toft
       @nodes = {}
     end
     
-    def create_node(hostname, ip, type)
-      node = Node.new(hostname, ip, type)
+    def create_node(hostname, options)
+      node = Node.new(hostname, options)
       node.add_observer self
       @nodes[hostname] = node
     end

data/lib/toft/version.rb

@@ -1,3 +1,3 @@
 module Toft
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/toft.rb

@@ -4,12 +4,15 @@ require 'toft/chef/chef_attributes'
 require 'toft/chef/chef_runner'
 
 module Toft
+  DYNAMIC_IP = "0.0.0.0"
+  DOMAIN = "foo"
+  
   class << self
     attr_accessor :cookbook_path, :role_path
   end
   
-  def create_node(hostname, ip, type)
-    NodeController.instance.create_node(hostname, ip, type)
+  def create_node(hostname, options = {})
+    NodeController.instance.create_node(hostname, options)
   end
   
   def find(hostname)