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
e8c3e3d6
Commit
e8c3e3d6
authored
Jun 14, 2015
by
Victor Schröder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleans some unnecessary white spaces in ec2.py dynamic inventory plugin
parent
77a2ad0e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
plugins/inventory/ec2.py
+2
-4
No files found.
plugins/inventory/ec2.py
View file @
e8c3e3d6
...
...
@@ -420,7 +420,7 @@ class Ec2Inventory(object):
self
.
add_rds_instance
(
instance
,
region
)
except
boto
.
exception
.
BotoServerError
as
e
:
error
=
e
.
reason
if
e
.
error_code
==
'AuthFailure'
:
error
=
self
.
get_auth_error_message
()
if
not
e
.
reason
==
"Forbidden"
:
...
...
@@ -513,7 +513,7 @@ class Ec2Inventory(object):
errors
.
append
(
" - No Boto config found at any expected location '
%
s'"
%
', '
.
join
(
boto_paths
))
return
'
\n
'
.
join
(
errors
)
def
fail_with_error
(
self
,
err_msg
):
'''log an error to std err for ansible-playbook to consume and exit'''
sys
.
stderr
.
write
(
err_msg
)
...
...
@@ -1025,7 +1025,6 @@ class Ec2Inventory(object):
return
list
(
name_list
)
def
get_host_info_dict_from_instance
(
self
,
instance
):
instance_vars
=
{}
for
key
in
vars
(
instance
):
...
...
@@ -1225,7 +1224,6 @@ class Ec2Inventory(object):
return
re
.
sub
(
"[^A-Za-z0-9
\
_]"
,
"_"
,
word
)
def
json_format_dict
(
self
,
data
,
pretty
=
False
):
''' Converts a dict to a JSON object and dumps it as a formatted
string '''
...
...
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