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
821858ed
Commit
821858ed
authored
Jan 27, 2014
by
jctanner
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5380 from dhml/devel
ec2_group: rules can't reference containing group fix #5309
parents
97d6e5e6
c5433d97
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletions
+18
-1
library/cloud/ec2_group
+18
-1
No files found.
library/cloud/ec2_group
View file @
821858ed
...
...
@@ -87,7 +87,10 @@ EXAMPLES = '''
- proto: udp
from_port: 10051
to_port: 10051
group_id: abcdef
group_id: sg-12345678
- proto: all
# the containing group name may be specified here
group_name: example
'''
try
:
...
...
@@ -134,6 +137,7 @@ def main():
groups
=
{}
for
curGroup
in
ec2
.
get_all_security_groups
():
groups
[
curGroup
.
id
]
=
curGroup
groups
[
curGroup
.
name
]
=
curGroup
if
curGroup
.
name
==
name
and
curGroup
.
vpc_id
==
vpc_id
:
group
=
curGroup
...
...
@@ -185,11 +189,24 @@ def main():
if
rules
:
for
rule
in
rules
:
group_id
=
None
group_name
=
None
ip
=
None
if
'group_id'
in
rule
and
'cidr_ip'
in
rule
:
module
.
fail_json
(
msg
=
"Specify group_id OR cidr_ip, not both"
)
elif
'group_name'
in
rule
and
'cidr_ip'
in
rule
:
module
.
fail_json
(
msg
=
"Specify group_name OR cidr_ip, not both"
)
elif
'group_id'
in
rule
and
'group_name'
in
rule
:
module
.
fail_json
(
msg
=
"Specify group_id OR group_name, not both"
)
elif
'group_id'
in
rule
:
group_id
=
rule
[
'group_id'
]
elif
'group_name'
in
rule
:
group_name
=
rule
[
'group_name'
]
if
group_name
in
groups
:
group_id
=
groups
[
group_name
]
.
id
elif
group_name
==
name
:
group_id
=
group
.
id
groups
[
group_id
]
=
group
groups
[
group_name
]
=
group
elif
'cidr_ip'
in
rule
:
ip
=
rule
[
'cidr_ip'
]
...
...
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