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
6b1ae82a
Commit
6b1ae82a
authored
Sep 17, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow filtering by availability zone for exact_count with ec2
Fixes #8863
parent
c3612e08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
library/cloud/ec2
+8
-4
No files found.
library/cloud/ec2
View file @
6b1ae82a
...
...
@@ -483,10 +483,10 @@ except ImportError:
print
"failed=True msg='boto required for this module'"
sys
.
exit
(
1
)
def
find_running_instances_by_count_tag
(
module
,
ec2
,
count_tag
):
def
find_running_instances_by_count_tag
(
module
,
ec2
,
count_tag
,
zone
=
None
):
# get reservations for instances that match tag(s) and are running
reservations
=
get_reservations
(
module
,
ec2
,
tags
=
count_tag
,
state
=
"running"
)
reservations
=
get_reservations
(
module
,
ec2
,
tags
=
count_tag
,
state
=
"running"
,
zone
=
zone
)
instances
=
[]
for
res
in
reservations
:
...
...
@@ -507,7 +507,7 @@ def _set_none_to_blank(dictionary):
return
result
def
get_reservations
(
module
,
ec2
,
tags
=
None
,
state
=
None
):
def
get_reservations
(
module
,
ec2
,
tags
=
None
,
state
=
None
,
zone
=
None
):
# TODO: filters do not work with tags that have underscores
filters
=
dict
()
...
...
@@ -542,6 +542,9 @@ def get_reservations(module, ec2, tags=None, state=None):
# http://stackoverflow.com/questions/437511/what-are-the-valid-instancestates-for-the-amazon-ec2-api
filters
.
update
({
'instance-state-name'
:
state
})
if
zone
:
filters
.
update
({
'availability-zone'
:
zone
})
results
=
ec2
.
get_all_instances
(
filters
=
filters
)
return
results
...
...
@@ -655,8 +658,9 @@ def enforce_count(module, ec2):
exact_count
=
module
.
params
.
get
(
'exact_count'
)
count_tag
=
module
.
params
.
get
(
'count_tag'
)
zone
=
module
.
params
.
get
(
'zone'
)
reservations
,
instances
=
find_running_instances_by_count_tag
(
module
,
ec2
,
count_tag
)
reservations
,
instances
=
find_running_instances_by_count_tag
(
module
,
ec2
,
count_tag
,
zone
)
changed
=
None
checkmode
=
False
...
...
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