Commit graph

27 commits

Author SHA1 Message Date
Toshio Kuratomi
1c4da434c7 Merge pull request #2421 from willthames/ec2_fix_vpc_security_token
Use connect_to_aws where possible
2016-03-04 11:06:22 -08:00
Toshio Kuratomi
e9454fa44f Merge pull request #2352 from bermudezjd/feature/iam_policy_present_state_includes_policy_changes
Feature/iam policy present state includes policy changes
2016-02-24 08:50:50 -08:00
Bermudez, Jaime
2ad0be9425 Merge branch 'devel' into feature/iam_policy_present_state_includes_policy_changes
Conflicts:
	cloud/amazon/iam_policy.py
2016-01-11 13:13:33 -05:00
Yoichi Imai
00376af7d6 Fix iam_policy pdoc variable 2016-01-08 13:05:31 +09:00
Brian Coca
1fe6479617 be smarter when dealing with policy_json input
Now module will assume that if the argument is a string it is already formated as json
and will only try to convert non strings into json string.
Also removed unused 'msg' var declarations and the ifs that set them
fixes #2009
2015-12-24 00:18:21 -05:00
Jay Rogers
cab97cd2d9 Update in Amazon IAM Policy Documentation
There were typos in the documentation that made the examples seem misleading of what was being demonstrated. This update fixes that.
2015-11-25 18:46:17 -06:00
Mike Riddle
062c7764e6 Fixed error message: TypeError: fail_json() takes exactly 1 argument (2 given) 2015-11-18 15:10:15 -05:00
Will Thames
0dd58e9326 Use connect_to_aws where possible
`connect_to_aws` fixes a bug with security tokens in AWS.
Modules should use that rather than calling
`boto.x.connect_to_region`
2015-11-06 19:05:01 +10:00
Brian Coca
c91da5714e Merge pull request #2279 from wimnat/feature/iam_policy_idempotentcy
Allow iam_policy to maintain idempotence if the role referenced has …
2015-11-03 13:10:42 -05:00
Bermudez, Jaime
6992d0d465 Merge remote-tracking branch 'upstream/devel' into feature/iam_policy_present_state_includes_policy_changes 2015-10-25 08:37:40 -04:00
Bermudez, Jaime
d5f48d29e1 Simplify logic around "present" state and skip dupes. If the policy doesn't exist or the policy document doesn't match or if we're not skipping dupes, then we go ahead and update the respective user/group/role policy. 2015-10-22 14:54:28 -04:00
Etherdaemon
08559670e5 Update try statement as pointed out by defionscode 2015-10-22 09:12:58 +10:00
Etherdaemon
2b2285eb67 fixes #12831 by updating the boto iam connection method to connect_to_region 2015-10-20 16:38:27 +10:00
whiter
6fc58855b9 Allow iam_policy to maintain idempotentce if the role referenced has been removed 2015-10-15 13:21:05 +11:00
Brian Coca
7af7ef2ef7 Merge pull request #2086 from wimnat/feature/issue-2085
Remove 'str' type so that json is properly quoted
2015-10-07 21:34:00 -04:00
Brian Coca
c4f64d822c changed modules to use common ec2 docs for region 2015-10-07 16:16:24 -04:00
Rob
9bf0d06e4a Update iam_policy.py
Fixed doc for policy_name - it is a required field
Removed empty aliases
2015-09-17 17:52:42 +10:00
whiter
719f68e057 Remove 'str' type so that json is properly quoted 2015-09-16 17:52:43 +10:00
wimnat
8e9c85bed2 Remove unnecessary json.loads 2015-09-14 14:23:34 +10:00
Baraa Basata
dc9dfa9ef8 Fix iam_policy example 2015-07-22 00:03:33 -04:00
Brian Coca
52543435d6 Merge pull request #1562 from micxer/iam_policy-json-string
Add the option to pass a string as policy
2015-07-04 19:11:34 -04:00
Michael Weinrich
4da3a724f1 Fix connection creation to allow usage of profiles with boto 2015-06-30 08:51:36 +02:00
Toshio Kuratomi
7edacf6b1c Use module.fail_json() instead of sys.exit() 2015-06-29 13:26:21 -07:00
Michael Weinrich
559ad374f5 Add the option to pass a string as policy 2015-06-24 12:03:01 +02:00
Greg DeKoenigsberg
28a869a030 Updating cloud modules with proper github author information 2015-06-15 14:41:22 -04:00
Jonathan Davila
e2773f7554 author fix 2015-05-27 08:37:39 -04:00
Jonathan Davila
19e7e99470 iam_policy 2015-03-03 15:23:06 -05:00