cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added better region handling and enabled eu-central-1

Browse source 
Make use of improved connect_to_aws that throws an exception
if a region can't be connected to (e.g. eu-central-1 requires
boto 2.34 onwards)

Add eu-central-1 to the two modules that hardcode their regions
Add us-gov-west-1 to ec2_ami_search to match documentation!
This pull request makes use of the changes in ansible/ansible#9419
This commit is contained in:
Will Thames 2014-11-01 12:44:44 +10:00
parent 19b328c4df
commit 30c7f9a7d3
8 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cloud/amazon/ec2_ami_search.py
View file

@ -56,7 +56,8 @@ 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", "us-gov-west-1"] "eu-central-1", "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
@ -88,11 +89,13 @@ SUPPORTED_DISTROS = ['ubuntu']
AWS_REGIONS = ['ap-northeast-1', AWS_REGIONS = ['ap-northeast-1',
'ap-southeast-1', 'ap-southeast-1',
'ap-southeast-2', 'ap-southeast-2',
'eu-central-1',
'eu-west-1', 'eu-west-1',
'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 get_url(module, url): def get_url(module, url):

2
cloud/amazon/ec2_asg.py
View file

@ -272,7 +272,7 @@ def create_autoscaling_group(connection, module):
region, ec2_url, aws_connect_params = get_aws_connection_info(module) region, ec2_url, aws_connect_params = get_aws_connection_info(module)
try: try:
ec2_connection = connect_to_aws(boto.ec2, region, **aws_connect_params) ec2_connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
asg_tags = [] asg_tags = []

4
cloud/amazon/ec2_elb.py
View file

@ -258,7 +258,7 @@ class ElbManager:
try: try:
elb = connect_to_aws(boto.ec2.elb, self.region, elb = connect_to_aws(boto.ec2.elb, self.region,
**self.aws_connect_params) **self.aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
elbs = elb.get_all_load_balancers() elbs = elb.get_all_load_balancers()
@ -278,7 +278,7 @@ class ElbManager:
try: try:
ec2 = connect_to_aws(boto.ec2, self.region, ec2 = connect_to_aws(boto.ec2, self.region,
**self.aws_connect_params) **self.aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
return ec2.get_only_instances(instance_ids=[self.instance_id])[0] return ec2.get_only_instances(instance_ids=[self.instance_id])[0]

2
cloud/amazon/ec2_elb_lb.py
View file

@ -374,7 +374,7 @@ class ElbManager(object):
try: try:
return connect_to_aws(boto.ec2.elb, self.region, return connect_to_aws(boto.ec2.elb, self.region,
**self.aws_connect_params) **self.aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
self.module.fail_json(msg=str(e)) self.module.fail_json(msg=str(e))
def _delete_elb(self): def _delete_elb(self):

1
cloud/amazon/ec2_facts.py
View file

@ -65,6 +65,7 @@ class Ec2Metadata(object):
AWS_REGIONS = ('ap-northeast-1', AWS_REGIONS = ('ap-northeast-1',
'ap-southeast-1', 'ap-southeast-1',
'ap-southeast-2', 'ap-southeast-2',
'eu-central-1',
'eu-west-1', 'eu-west-1',
'sa-east-1', 'sa-east-1',
'us-east-1', 'us-east-1',

2
cloud/amazon/ec2_lc.py
View file

@ -265,7 +265,7 @@ def main():
try: try:
connection = connect_to_aws(boto.ec2.autoscale, region, **aws_connect_params) connection = connect_to_aws(boto.ec2.autoscale, region, **aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
state = module.params.get('state') state = module.params.get('state')

2
cloud/amazon/ec2_metric_alarm.py
View file

@ -271,7 +271,7 @@ def main():
region, ec2_url, aws_connect_params = get_aws_connection_info(module) region, ec2_url, aws_connect_params = get_aws_connection_info(module)
try: try:
connection = connect_to_aws(boto.ec2.cloudwatch, region, **aws_connect_params) connection = connect_to_aws(boto.ec2.cloudwatch, region, **aws_connect_params)
except boto.exception.NoAuthHandlerFound, e: except (boto.exception.NoAuthHandlerFound, StandardError), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
if state == 'present': if state == 'present':

4
cloud/amazon/ec2_scaling_policy.py
View file

@ -163,9 +163,7 @@ def main():
try: try:
connection = connect_to_aws(boto.ec2.autoscale, region, **aws_connect_params) connection = connect_to_aws(boto.ec2.autoscale, region, **aws_connect_params)
if not connection: except (boto.exception.NoAuthHandlerFound, StandardError), e:
module.fail_json(msg="failed to connect to AWS for the given region: %s" % str(region))
except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg = str(e)) module.fail_json(msg = str(e))
if state == 'present': if state == 'present':