Commit 114ad44f by Michael DeHaan

Merge pull request #5926 from riceo/devel

Fix Linode inventory plugin causing a Chube exception when attempting to obtain information on a specific Linode host
parents 3f2f5fec a326d244
......@@ -132,7 +132,7 @@ class LinodeInventory(object):
if os.path.isfile(self.cache_path_index):
return True
return False
def read_settings(self):
"""Reads the settings from the .ini file."""
config = ConfigParser.SafeConfigParser()
......@@ -204,7 +204,7 @@ class LinodeInventory(object):
dest = node.label
# Add to index
self.index[dest] = [node.api_id]
self.index[dest] = node.api_id
# Inventory: Group by node ID (always a group of 1)
self.inventory[node.api_id] = [dest]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment