adding knife config file support for AWS regions

abecciu · Nov 8, 2010 · c46d217 · c46d217
1 parent 11ef5a9
commit c46d217
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/chef/lib/chef/knife/ec2_server_create.rb b/chef/lib/chef/knife/ec2_server_create.rb
@@ -98,7 +98,8 @@ class Ec2ServerCreate < Knife
       option :region,
         :long => "--region REGION",
         :description => "Your AWS region",
-        :default => "us-east-1"
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
 
       option :distro,
         :short => "-d DISTRO",
@@ -145,7 +146,7 @@ def run
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
           :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
-          :region => config[:region]
+          :region => Chef::Config[:knife][:region]
         )
 
         server = connection.servers.create(

diff --git a/chef/lib/chef/knife/ec2_server_delete.rb b/chef/lib/chef/knife/ec2_server_delete.rb
@@ -40,7 +40,8 @@ class Ec2ServerDelete < Knife
       option :region,
         :long => "--region REGION",
         :description => "Your AWS region",
-        :default => "us-east-1"
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
 
       def h
         @highline ||= HighLine.new
@@ -55,7 +56,7 @@ def run
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
           :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
-          :region => config[:region]
+          :region => Chef::Config[:knife][:region]
         )
 
         @name_args.each do |instance_id|
@@ -84,7 +85,3 @@ def run
   end
 end
 
-
-
-
-
diff --git a/chef/lib/chef/knife/ec2_server_list.rb b/chef/lib/chef/knife/ec2_server_list.rb
@@ -40,7 +40,8 @@ class Ec2ServerList < Knife
       option :region,
         :long => "--region REGION",
         :description => "Your AWS region",
-        :default => "us-east-1"
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
 
       def h
         @highline ||= HighLine.new
@@ -57,7 +58,7 @@ def run
         connection = Fog::AWS::EC2.new(
           :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
           :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
-          :region => config[:region]
+          :region => Chef::Config[:knife][:region]
         )
 
         server_list = [