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
0905683c
Commit
0905683c
authored
Aug 10, 2013
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3806 from neomantra/issue_3438_x
digital_ocean #3438: use get instead of [] to prevent KeyError
parents
4bdbe4dc
0c9c4ae4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
12 deletions
+16
-12
plugins/inventory/digital_ocean.py
+16
-12
No files found.
plugins/inventory/digital_ocean.py
View file @
0905683c
...
...
@@ -350,17 +350,21 @@ or environment variables (DO_CLIENT_ID and DO_API_KEY)'''
self
.
push
(
self
.
inventory
,
'size_'
+
droplet
[
'size_id'
],
dest
)
self
.
push
(
self
.
inventory
,
'status_'
+
droplet
[
'status'
],
dest
)
region_name
=
self
.
index
[
'region_to_name'
][
droplet
[
'region_id'
]]
self
.
push
(
self
.
inventory
,
'region_'
+
region_name
,
dest
)
region_name
=
self
.
index
[
'region_to_name'
]
.
get
(
droplet
[
'region_id'
])
if
region_name
:
self
.
push
(
self
.
inventory
,
'region_'
+
region_name
,
dest
)
size_name
=
self
.
index
[
'size_to_name'
][
droplet
[
'size_id'
]]
self
.
push
(
self
.
inventory
,
'size_'
+
size_name
,
dest
)
size_name
=
self
.
index
[
'size_to_name'
]
.
get
(
droplet
[
'size_id'
])
if
size_name
:
self
.
push
(
self
.
inventory
,
'size_'
+
size_name
,
dest
)
image_name
=
self
.
index
[
'image_to_name'
][
droplet
[
'image_id'
]]
self
.
push
(
self
.
inventory
,
'image_'
+
image_name
,
dest
)
image_name
=
self
.
index
[
'image_to_name'
]
.
get
(
droplet
[
'image_id'
])
if
image_name
:
self
.
push
(
self
.
inventory
,
'image_'
+
image_name
,
dest
)
distro_name
=
self
.
index
[
'image_to_distro'
][
droplet
[
'image_id'
]]
self
.
push
(
self
.
inventory
,
'distro_'
+
distro_name
,
dest
)
distro_name
=
self
.
index
[
'image_to_distro'
]
.
get
(
droplet
[
'image_id'
])
if
distro_name
:
self
.
push
(
self
.
inventory
,
'distro_'
+
distro_name
,
dest
)
def
load_droplet_variables_for_host
(
self
):
...
...
@@ -397,12 +401,12 @@ or environment variables (DO_CLIENT_ID and DO_API_KEY)'''
# Generate user-friendly variables (i.e. not the ID's)
if
droplet
.
has_key
(
'region_id'
):
info
[
'do_region'
]
=
self
.
index
[
'region_to_name'
]
[
droplet
[
'region_id'
]]
info
[
'do_region'
]
=
self
.
index
[
'region_to_name'
]
.
get
(
droplet
[
'region_id'
])
if
droplet
.
has_key
(
'size_id'
):
info
[
'do_size'
]
=
self
.
index
[
'size_to_name'
]
[
droplet
[
'size_id'
]]
info
[
'do_size'
]
=
self
.
index
[
'size_to_name'
]
.
get
(
droplet
[
'size_id'
])
if
droplet
.
has_key
(
'image_id'
):
info
[
'do_image'
]
=
self
.
index
[
'image_to_name'
]
[
droplet
[
'image_id'
]]
info
[
'do_distro'
]
=
self
.
index
[
'image_to_distro'
]
[
droplet
[
'image_id'
]]
info
[
'do_image'
]
=
self
.
index
[
'image_to_name'
]
.
get
(
droplet
[
'image_id'
])
info
[
'do_distro'
]
=
self
.
index
[
'image_to_distro'
]
.
get
(
droplet
[
'image_id'
])
return
info
...
...
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