Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add support for AWS Australia (ap-southeast-2). #1271

Merged
merged 2 commits into from Nov 14, 2012
Jump to file or symbol
Failed to load files and symbols.
+14 −6
Split
@@ -258,7 +258,7 @@ def initialize(options={})
setup_credentials(options)
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
end
@@ -55,7 +55,7 @@ def initialize(options={})
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
end
View
@@ -221,7 +221,7 @@ def initialize(options={})
setup_credentials(options)
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
end
View
@@ -81,7 +81,7 @@ def initialize(options={})
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
end
@@ -60,6 +60,8 @@ def initialize(attributes={})
'ami-5e0fa45f'
when 'ap-southeast-1'
'ami-f092eca2'
+ when 'ap-southeast-2'
+ 'ami-fb8611c1' # Ubuntu 12.04 LTS 64bit (EBS)
@geemus

geemus Nov 14, 2012

Owner

It slipped my mind when we discussed this, but I think the other ones may be instance store 10.04 instead of EBS. Not sure how much this matters but we should perhaps discuss. Thoughts?

@aswoodward

aswoodward Nov 14, 2012

Contributor

@geemus: Line 58's comment implies that the other ones are also EBS:

case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
@geemus

geemus Nov 14, 2012

Owner

Fair enough, probably misremembered. Fine to leave this as-is.

when 'eu-west-1'
'ami-3d1f2b49'
when 'sa-east-1'
View
@@ -101,7 +101,7 @@ def initialize(options={})
@use_iam_profile = options[:use_iam_profile]
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
@@ -71,6 +71,9 @@ def describe_availability_zones(filters = {})
{"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1a", "zoneState" => "available"},
{"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1b", "zoneState" => "available"},
+
+ {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2a", "zoneState" => "available"},
+ {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2b", "zoneState" => "available"},
]
availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }
@@ -198,6 +198,7 @@ def self.elb_hosted_zone_mapping
@elb_hosted_zone_mapping ||= {
"ap-northeast-1" => "Z2YN17T5R711GT",
"ap-southeast-1" => "Z1WI8VXHPB1R38",
+ "ap-southeast-2" => "Z2999QAZ9SRTIC",
"eu-west-1" => "Z3NF1Z3NOM5OY2",
"sa-east-1" => "Z2ES78Y61JGQKS",
"us-east-1" => "Z3DZXE0Q79N41H",
View
@@ -40,7 +40,7 @@ def initialize(options={})
setup_credentials(options)
@region = options[:region] || 'us-east-1'
- unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+ unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
raise ArgumentError, "Unknown region: #{@region.inspect}"
end
end
@@ -3,6 +3,7 @@
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
'ap-northeast-1' => 'ami-60c77761',
'ap-southeast-1' => 'ami-a4ca8df6',
+ 'ap-southeast-2' => 'ami-fb8611c1',
'eu-west-1' => 'ami-e1e8d395',
'sa-east-1' => 'ami-8cd80691',
'us-east-1' => 'ami-a29943cb',
@@ -3,6 +3,7 @@
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
'ap-northeast-1' => 'ami-60c77761',
'ap-southeast-1' => 'ami-a4ca8df6',
+ 'ap-southeast-2' => 'ami-fb8611c1',
'eu-west-1' => 'ami-e1e8d395',
'sa-east-1' => 'ami-8cd80691',
'us-east-1' => 'ami-a29943cb',