Merge branch 'CHEF-1765'

chef · Nov 8, 2010 · 3c52e2e · 3c52e2e · rmoriz · Feb 14, 2011
2 parents dffa422 + 6fde65c
commit 3c52e2e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/chef/lib/chef/knife/ec2_server_create.rb b/chef/lib/chef/knife/ec2_server_create.rb
@@ -50,7 +50,8 @@ class Ec2ServerCreate < Knife
         :short => "-Z ZONE",
         :long => "--availability-zone ZONE",
         :description => "The Availability Zone",
-        :default => "us-east-1b"
+        :default => "us-east-1b",
+        :proc => Proc.new { |key| Chef::Config[:knife][:availability_zone] = key }
 
       option :chef_node_name,
         :short => "-N NAME",
@@ -154,7 +155,7 @@ def run
           :groups => config[:security_groups],
           :flavor_id => config[:flavor],
           :key_name => Chef::Config[:knife][:aws_ssh_key_id],
-          :availability_zone => config[:availability_zone]
+          :availability_zone => Chef::Config[:availability_zone]
         )
 
         puts "#{h.color("Instance ID", :cyan)}: #{server.id}"