Commit graph

42 commits

Author SHA1 Message Date
Michael DeHaan
3bead39c75 Merge branch 'spelling' of git://github.com/cgar/ansible into devel
Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
2014-08-08 13:28:45 -04:00
James Cammarata
3a6d00f81d Add note about changing resource_tags to required in ec2_vpc 2014-07-10 12:18:35 -05:00
James Cammarata
2184b15542 Merge branch 'psa-resource-tag-required' into devel 2014-07-10 12:17:39 -05:00
James Cammarata
0798f3cda4 Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848 2014-07-09 12:24:06 -05:00
James Cammarata
aecd292f13 Merge branch 'resource-tag-required' of https://github.com/psa/ansible into psa-resource-tag-required 2014-07-09 11:49:41 -05:00
James Cammarata
1f813ba128 Merge pull request #8022 from psa/vpc-gateway-peering
Fix for #7368 breaks peering connections. Unreak them.
2014-07-05 00:08:04 -05:00
Paul Armstrong
97b3e8c6e4 Fix for #7368 breaks peering connections. Unreak them. 2014-07-02 23:13:29 +00:00
James Cammarata
0ee28c1a0e Make sure subnets and route_tables are initialized before using
Fixes #7712
2014-07-02 09:26:51 -05:00
Paul Armstrong
d5b6781482 Make resource_tags required and do whitespace cleanup 2014-07-01 12:33:06 -07:00
Yap Sok Ann
f80467e013 ec2_vpc: Fix error when using InstanceId as a route gateway.
See https://github.com/ansible/ansible/issues/7368

Fixes #7368
2014-06-20 14:08:22 -05:00
Michael Peters
87a6290065 Use the right name for the vpc_id parameter
Fixes #7853
2014-06-20 10:49:41 -05:00
Michael Peters
3f1cf5a98a This should fix issue #7848
We need to catch any InvalidVpcID.NotFound errors and treat them
just like getting back a vpc that's not "available"
2014-06-19 14:25:05 -04:00
Carlos E. Garcia
7f5dd5e85d multiple spelling error changes 2014-04-29 10:41:05 -04:00
James Cammarata
24cfcd1f88 Merge pull request #6985 from jimi-c/issue_6763_ec2_vpc_params
Ensure params were set in ec2_vpc before accessing them
2014-04-23 10:08:50 -05:00
James Cammarata
a37a84243b Check resource_tags value before using it in ec2_vpc
Fixes #7024
2014-04-16 12:21:32 -05:00
James Cammarata
46ea3155c6 Ensure params were set in ec2_vpc before accessing them
Fixes #6763
2014-04-14 10:58:07 -05:00
James Laska
f96618c967 Use proper YAML quotes to fix webdocs 2014-03-30 14:26:18 -04:00
James Laska
6c8d8a746f Fix YAML docstring that broke webdocs 2014-03-29 19:15:42 -04:00
Michael DeHaan
e6ab2d83b8 Merge pull request #6081 from alexanderpopov1/ec2_vpc-subnet-tagging
Added support for tagging subnets in ec2_vpc module
2014-03-28 15:27:59 -04:00
Michael DeHaan
8285ac5b31 Merge branch 'ec2_vpc-multiple-vpcs-support' of git://github.com/alexanderpopov1/ansible into devel
Conflicts:
	library/cloud/ec2_vpc
2014-03-28 12:51:40 -04:00
Richard C Isaacson
e40fd9bb0d Bulk update of choices=BOOLEANS to type='bool' 2014-03-11 22:36:44 -05:00
Alexander Popov
d48880debc Added 'version_added' to the 'resrouce_tags' attribute in DOCUMENTATION section. 2014-03-11 13:27:03 -04:00
Alexander Popov
8c8ff79c8b Added code to create tags on the VPC resource 2014-03-11 13:27:02 -04:00
Alexander Popov
6dfafb0cf5 Updated module documentation, re: resource_tags 2014-03-11 13:27:02 -04:00
Alexander Popov
49e9c42770 Renamed vpc_id_tags to resource_tags 2014-03-11 13:27:02 -04:00
Alexander Popov
514e4b3742 Added multi VPC support
Initial commit

Refactored terminate_vpc method to support vpc_id_tags

Cleaned up find_vpc() method
2014-03-11 13:27:02 -04:00
Alexander Popov
e56cffe3a5 Renamed instance_tags to resource_tags based on community feedback. 2014-03-05 10:11:55 -05:00
Alexander Popov
3c4b14523b Renamed subnet's 'tags' attribute into 'instance_tags' to distinguish it from Ansible's own 'tags' and to conform to ec2 module naming for AWS tags. 2014-03-05 10:11:55 -05:00
Alexander Popov
428c69c08a Refactored subnet tagging to account for AWS delays; added 'tags' attribute to 'subnet' node in the returned json. 2014-03-05 10:11:55 -05:00
Alexander Popov
4dbac647bc Added documentation for subnets: tags: option 2014-03-05 10:11:55 -05:00
Alexander Popov
2a108b2aeb Added subnet tagging. 2014-03-05 10:11:55 -05:00
Richard Isaacson
73fa767a6b Added instance_tenancy functionality per social request. 2014-02-27 09:29:00 -06:00
James Cammarata
8a7c68dc18 Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params
Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
2014-02-26 09:37:26 -06:00
James Cammarata
056d54ebd3 Adding 'validate_certs' option to EC2 modules
When disabled, the boto connection will be instantiated without validating
the SSL certificate from the target endpoint. This allows the modules to connect
to Eucalyptus instances running with self-signed certs without errors.

Fixes #3978
2014-02-13 12:32:49 -06:00
Scott Anderson
baf508a379 Change standard AWS access and secret key parameter names to aws_access_key and aws_secret_key. Fixes an authentication problem with the rds module and standardizes the naming convention on something more encompassing than ec2_*_key. 2014-02-08 18:35:26 -05:00
Timur Batyrshin
658c15930e reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 2014-02-03 13:00:40 -06:00
willthames
12005a1cd0 Move more responsibility to common EC2 module
Moved `AWS_REGIONS` into `ec2` module
Created `ec2_connect` method in `ec2` module
Updated modules able to use `ec2_connect` and `AWS_REGIONS`
2013-12-17 14:07:24 +10:00
David Hummel
614efadb7a Fix issue #5043: ec2_vpc module wait=yes state attribute retrieval 2013-12-05 10:47:22 -05:00
Justin Ludwig
26374d89a0 Fix AWS credential params for s3 and other modules
The `ec2_ami`, `ec2_elb`, `ec2_tag`, `ec2_vpc`, `route53`, and `s3` modules
all canonicalize the AWS access and secret key params as
`aws_access_key` and `aws_secret_key`. However, following the fixes for #4540,
those modules now use `get_ec2_creds` from `lib/ansible/module_utils/ec2.py`,
which requires access/secret key params to be canonicalized as
`ec2_access_key` and `ec2_secret_key`. As a result, AWS credentials passed
to those six modules as parameters are ignored (they instead always use
the AWS credentials specified via environment variables, or nothing).

So this change fixes those six modules to canonicalize the
AWS access and secret key params as `ec2_access_key` and `ec2_secret_key`,
allowing them to again accept AWS credentials passed via module params.
2013-11-26 19:29:06 -08:00
James Tanner
52032b80d4 Fix pep8 error in ec2_vpc 2013-11-19 16:31:25 -05:00
Michael DeHaan
2726b13245 Changelog updates and a few module renames. vpc -> ec2_vpc, githooks -> github_hooks, blacklist -> kernel_blacklist. These are all new in 1.4 so safe to change. 2013-11-18 18:28:21 -05:00
Michael DeHaan
aee1fcad05 Update changelog, rename vpc module to ec2_vpc. 2013-11-18 17:59:40 -05:00
Renamed from library/cloud/vpc (Browse further)