Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
22f3f2b7
Commit
22f3f2b7
authored
Jul 31, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8174 from altruism/devel
Make ec2_group module not just fail
parents
745b2807
ea9af2cb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
library/cloud/ec2_group
+3
-3
No files found.
library/cloud/ec2_group
View file @
22f3f2b7
...
...
@@ -106,7 +106,7 @@ def addRulesToLookup(rules, prefix, dict):
grant
.
group_id
,
grant
.
cidr_ip
)]
=
rule
def
get_target_from_rule
(
module
,
rule
,
name
,
group
,
groups
):
def
get_target_from_rule
(
module
,
ec2
,
rule
,
name
,
group
,
groups
,
vpc_id
):
"""
Returns tuple of (group_id, ip) after validating rule params.
...
...
@@ -249,7 +249,7 @@ def main():
# Now, go through all provided rules and ensure they are there.
if
rules
:
for
rule
in
rules
:
group_id
,
ip
,
target_group_created
=
get_target_from_rule
(
module
,
rule
,
name
,
group
,
groups
)
group_id
,
ip
,
target_group_created
=
get_target_from_rule
(
module
,
ec2
,
rule
,
name
,
group
,
groups
,
vpc_id
)
if
target_group_created
:
changed
=
True
...
...
@@ -289,7 +289,7 @@ def main():
# Now, go through all provided rules and ensure they are there.
if
rules_egress
:
for
rule
in
rules_egress
:
group_id
,
ip
,
target_group_created
=
get_target_from_rule
(
module
,
rule
,
name
,
group
,
groups
)
group_id
,
ip
,
target_group_created
=
get_target_from_rule
(
module
,
ec2
,
rule
,
name
,
group
,
groups
,
vpc_id
)
if
target_group_created
:
changed
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment