@@ -47,7 +47,7 @@ class Bootstrap < Knife
         :short => "-N NAME",
         :long => "--node-name NAME",
         :description => "The Chef node name for your new node"
-
+      
       option :prerelease,
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
 
@@ -30,7 +30,10 @@ validation_client_name "<%= Chef::Config[:validation_client_name] %>"
 # Using default node name"
 <% else %>
 node_name "<%= @config[:chef_node_name] %>"
-<% end %> 
+<% end %>
+<% if Chef::Config[:environment] != nil %>
+environment "<%= Chef::Config[:environment]%>"
+<% end %>
 EOP
 ) > /etc/chef/client.rb
 
 
@@ -170,7 +170,6 @@ def run
 
         puts("\n")
 
-
         puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
         puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
         puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
@@ -180,7 +179,6 @@ def run
 
         print(".") until tcp_test_ssh(server.dns_name) { sleep @initial_sleep_delay ||= 10; puts("done") }
 
-
         bootstrap_for_node(server).run
 
         puts "\n"
@@ -208,6 +206,7 @@ def bootstrap_for_node(server)
         bootstrap.config[:distro] = config[:distro]
         bootstrap.config[:use_sudo] = true
         bootstrap.config[:template_file] = config[:template_file]
+        bootstrap.config[:environment] = config[:environment]
         bootstrap
       end
 
 
@@ -565,6 +565,7 @@ def self.find_or_create(node_name)
     def self.build(node_name)
       node = new
       node.name(node_name)
+      node.chef_environment(Chef::Config[:environment]) unless Chef::Config[:environment].nil? || Chef::Config[:environment].chop.empty?
       node
     end
 
 
@@ -122,12 +122,13 @@ def run_list_for_environment(environment='_default')
       end
     end
 
-    def env_run_lists(hash=nil)
+    def env_run_lists(hash=nil, run_list_items_only=false)
       # TODO: should have btter validation, but leaving it as it is for now to make everything work first [nuo]
       if (!hash.nil? && hash.length > 0)
         hash.each do |k,v|
-          unless v["run_list"].nil? || v["run_list"].empty?
-            v["run_list"] = Chef::RunList.new(k).reset!(v["run_list"])
+          unless v["run_list"].nil?
+            rl = Chef::RunList.new(k).reset!(v["run_list"])
+            v["run_list"] = run_list_items_only ? rl.run_list_items : rl
           end
         end
         @env_run_lists = hash
@@ -166,7 +167,7 @@ def to_hash
         "override_attributes" => @override_attributes,
         "chef_type" => "role",
         "run_list" => @run_list.run_list,
-        "env_run_lists" => @env_run_lists
+        "env_run_lists" => env_run_lists(@env_run_lists, true)
       }
       result["_rev"] = couchdb_rev if couchdb_rev
       result