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
d0986a20
Commit
d0986a20
authored
Nov 13, 2013
by
James Tanner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use shared ec2 module snippet in elasticache module
parent
fd6b16ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
27 deletions
+8
-27
library/cloud/elasticache
+8
-27
No files found.
library/cloud/elasticache
View file @
d0986a20
...
...
@@ -479,11 +479,11 @@ def main():
cache_security_groups
=
{
'required'
:
False
,
'default'
:
[
'default'
],
'type'
:
'list'
},
zone
=
{
'required'
:
False
,
'default'
:
None
},
aws
_secret_key
=
{
'default'
:
None
,
'aliases'
:
[
'
ec2
_secret_key'
,
'secret_key'
],
ec2
_secret_key
=
{
'default'
:
None
,
'aliases'
:
[
'
aws
_secret_key'
,
'secret_key'
],
'no_log'
:
True
},
aws
_access_key
=
{
'default'
:
None
,
'aliases'
:
[
'
ec2
_access_key'
,
'access_key'
]},
ec2
_access_key
=
{
'default'
:
None
,
'aliases'
:
[
'
aws
_access_key'
,
'access_key'
]},
region
=
{
'default'
:
None
,
'required'
:
False
,
'aliases'
:
[
'aws_region'
,
'ec2_region'
],
'choices'
:
AWS_REGIONS
},
...
...
@@ -492,9 +492,7 @@ def main():
)
)
aws_secret_key
=
module
.
params
[
'aws_secret_key'
]
aws_access_key
=
module
.
params
[
'aws_access_key'
]
region
=
module
.
params
[
'region'
]
ec2_url
,
aws_access_key
,
aws_secret_key
,
region
=
get_ec2_creds
(
module
)
name
=
module
.
params
[
'name'
]
state
=
module
.
params
[
'state'
]
...
...
@@ -511,24 +509,6 @@ def main():
if
state
==
'present'
and
not
num_nodes
:
module
.
fail_json
(
msg
=
"'num_nodes' is a required parameter. Please specify num_nodes > 0"
)
if
not
aws_secret_key
:
if
'AWS_SECRET_KEY'
in
os
.
environ
:
aws_secret_key
=
os
.
environ
[
'AWS_SECRET_KEY'
]
elif
'EC2_SECRET_KEY'
in
os
.
environ
:
aws_secret_key
=
os
.
environ
[
'EC2_SECRET_KEY'
]
if
not
aws_access_key
:
if
'AWS_ACCESS_KEY'
in
os
.
environ
:
aws_access_key
=
os
.
environ
[
'AWS_ACCESS_KEY'
]
elif
'EC2_ACCESS_KEY'
in
os
.
environ
:
aws_access_key
=
os
.
environ
[
'EC2_ACCESS_KEY'
]
if
not
region
:
if
'AWS_REGION'
in
os
.
environ
:
region
=
os
.
environ
[
'AWS_REGION'
]
elif
'EC2_REGION'
in
os
.
environ
:
region
=
os
.
environ
[
'EC2_REGION'
]
if
not
region
:
module
.
fail_json
(
msg
=
str
(
"Either region or EC2_REGION environment variable must be set."
))
...
...
@@ -551,7 +531,8 @@ def main():
module
.
exit_json
(
**
facts_result
)
# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
# import module snippets
from
ansible.module_utils.basic
import
*
from
ansible.module_utils.ec2
import
*
main
()
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