mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge pull request #1271 from aswoodward/support_ap-southeast-2
Add support for AWS Australia (ap-southeast-2).
This commit is contained in:
commit
f4ae7a1e75
11 changed files with 14 additions and 6 deletions
|
@ -258,7 +258,7 @@ module Fog
|
||||||
setup_credentials(options)
|
setup_credentials(options)
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -55,7 +55,7 @@ module Fog
|
||||||
|
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -221,7 +221,7 @@ module Fog
|
||||||
setup_credentials(options)
|
setup_credentials(options)
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -81,7 +81,7 @@ module Fog
|
||||||
|
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -60,6 +60,8 @@ module Fog
|
||||||
'ami-5e0fa45f'
|
'ami-5e0fa45f'
|
||||||
when 'ap-southeast-1'
|
when 'ap-southeast-1'
|
||||||
'ami-f092eca2'
|
'ami-f092eca2'
|
||||||
|
when 'ap-southeast-2'
|
||||||
|
'ami-fb8611c1' # Ubuntu 12.04 LTS 64bit (EBS)
|
||||||
when 'eu-west-1'
|
when 'eu-west-1'
|
||||||
'ami-3d1f2b49'
|
'ami-3d1f2b49'
|
||||||
when 'sa-east-1'
|
when 'sa-east-1'
|
||||||
|
|
|
@ -101,7 +101,7 @@ module Fog
|
||||||
@use_iam_profile = options[:use_iam_profile]
|
@use_iam_profile = options[:use_iam_profile]
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,9 @@ module Fog
|
||||||
|
|
||||||
{"messageSet" => [], "regionName" => "ap-southeast-1", "zoneName" => "ap-southeast-1a", "zoneState" => "available"},
|
{"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-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 }
|
availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }
|
||||||
|
|
|
@ -198,6 +198,7 @@ module Fog
|
||||||
@elb_hosted_zone_mapping ||= {
|
@elb_hosted_zone_mapping ||= {
|
||||||
"ap-northeast-1" => "Z2YN17T5R711GT",
|
"ap-northeast-1" => "Z2YN17T5R711GT",
|
||||||
"ap-southeast-1" => "Z1WI8VXHPB1R38",
|
"ap-southeast-1" => "Z1WI8VXHPB1R38",
|
||||||
|
"ap-southeast-2" => "Z2999QAZ9SRTIC",
|
||||||
"eu-west-1" => "Z3NF1Z3NOM5OY2",
|
"eu-west-1" => "Z3NF1Z3NOM5OY2",
|
||||||
"sa-east-1" => "Z2ES78Y61JGQKS",
|
"sa-east-1" => "Z2ES78Y61JGQKS",
|
||||||
"us-east-1" => "Z3DZXE0Q79N41H",
|
"us-east-1" => "Z3DZXE0Q79N41H",
|
||||||
|
|
|
@ -40,7 +40,7 @@ module Fog
|
||||||
setup_credentials(options)
|
setup_credentials(options)
|
||||||
@region = options[:region] || 'us-east-1'
|
@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}"
|
raise ArgumentError, "Unknown region: #{@region.inspect}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,6 +3,7 @@ Shindo.tests('AWS::AutoScaling | notification configuration requests', ['aws', '
|
||||||
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
|
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
|
||||||
'ap-northeast-1' => 'ami-60c77761',
|
'ap-northeast-1' => 'ami-60c77761',
|
||||||
'ap-southeast-1' => 'ami-a4ca8df6',
|
'ap-southeast-1' => 'ami-a4ca8df6',
|
||||||
|
'ap-southeast-2' => 'ami-fb8611c1',
|
||||||
'eu-west-1' => 'ami-e1e8d395',
|
'eu-west-1' => 'ami-e1e8d395',
|
||||||
'sa-east-1' => 'ami-8cd80691',
|
'sa-east-1' => 'ami-8cd80691',
|
||||||
'us-east-1' => 'ami-a29943cb',
|
'us-east-1' => 'ami-a29943cb',
|
||||||
|
|
|
@ -3,6 +3,7 @@ Shindo.tests('AWS::AutoScaling | tag requests', ['aws', 'auto_scaling']) do
|
||||||
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
|
image_id = { # Ubuntu 12.04 LTS 64-bit EBS
|
||||||
'ap-northeast-1' => 'ami-60c77761',
|
'ap-northeast-1' => 'ami-60c77761',
|
||||||
'ap-southeast-1' => 'ami-a4ca8df6',
|
'ap-southeast-1' => 'ami-a4ca8df6',
|
||||||
|
'ap-southeast-2' => 'ami-fb8611c1',
|
||||||
'eu-west-1' => 'ami-e1e8d395',
|
'eu-west-1' => 'ami-e1e8d395',
|
||||||
'sa-east-1' => 'ami-8cd80691',
|
'sa-east-1' => 'ami-8cd80691',
|
||||||
'us-east-1' => 'ami-a29943cb',
|
'us-east-1' => 'ami-a29943cb',
|
||||||
|
|
Loading…
Reference in a new issue