Merge pull request #8791 from jrhe/aws_ec2_us-gov-west-1_region

Adds us-gov-west-1 aws ec2 region to cloud library
This commit is contained in:
James Cammarata 2014-08-29 09:34:09 -05:00
commit 4e3095877f
2 changed files with 4 additions and 2 deletions

View file

@ -56,7 +56,7 @@ options:
required: false required: false
default: us-east-1 default: us-east-1
choices: ["ap-northeast-1", "ap-southeast-1", "ap-southeast-2", choices: ["ap-northeast-1", "ap-southeast-1", "ap-southeast-2",
"eu-west-1", "sa-east-1", "us-east-1", "us-west-1", "us-west-2"] "eu-west-1", "sa-east-1", "us-east-1", "us-west-1", "us-west-2", "us-gov-west-1"]
virt: virt:
description: virutalization type description: virutalization type
required: false required: false

View file

@ -67,7 +67,9 @@ class Ec2Metadata(object):
'sa-east-1', 'sa-east-1',
'us-east-1', 'us-east-1',
'us-west-1', 'us-west-1',
'us-west-2') 'us-west-2',
'us-gov-west-1'
)
def __init__(self, module, ec2_metadata_uri=None, ec2_sshdata_uri=None, ec2_userdata_uri=None): def __init__(self, module, ec2_metadata_uri=None, ec2_sshdata_uri=None, ec2_userdata_uri=None):
self.module = module self.module = module