cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bugs in softlayer dynamic inventory (#28178)

Browse source 
* --host hostname did not work due to calling wrong function

* softlayer api returns a bunch of extra stuff in the tagReference dict that
  makes --list output crazy long, like over a terminal buffer for just one server
  this culls out the extranneous information and only inserts the actual user
  provided tags to each server.
This commit is contained in:
Paul Czarkowski 2018-09-19 17:10:15 -05:00 committed by ansibot
parent 02bfb9047c
commit caf658b420
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
contrib/inventory/softlayer.py
View file

@ -49,7 +49,7 @@ class SoftLayerInventory(object):
'primaryBackendIpAddress', 'primaryBackendIpAddress',
'primaryIpAddress', 'primaryIpAddress',
'datacenter', 'datacenter',
'tagReferences.tag.name', 'tagReferences',
'userData.value', 'userData.value',
] ]
@ -82,7 +82,7 @@ class SoftLayerInventory(object):
self.get_all_servers() self.get_all_servers()
print(self.json_format_dict(self.inventory, True)) print(self.json_format_dict(self.inventory, True))
elif self.args.host: elif self.args.host:
self.get_virtual_servers() self.get_all_servers()
print(self.json_format_dict(self.inventory["_meta"]["hostvars"][self.args.host], True)) print(self.json_format_dict(self.inventory["_meta"]["hostvars"][self.args.host], True))
def to_safe(self, word): def to_safe(self, word):
@ -139,6 +139,12 @@ class SoftLayerInventory(object):
dest = instance['primaryIpAddress'] dest = instance['primaryIpAddress']
instance['tags'] = list()
for tag in instance['tagReferences']:
instance['tags'].append(tag['tag']['name'])
del instance['tagReferences']
self.inventory["_meta"]["hostvars"][dest] = instance self.inventory["_meta"]["hostvars"][dest] = instance
# Inventory: group by memory # Inventory: group by memory
@ -168,9 +174,8 @@ class SoftLayerInventory(object):
# Inventory: group by type (hardware/virtual) # Inventory: group by type (hardware/virtual)
self.push(self.inventory, instance_type, dest) self.push(self.inventory, instance_type, dest)
# Inventory: group by tag for tag in instance['tags']:
for tag in instance['tagReferences']: self.push(self.inventory, tag, dest)
self.push(self.inventory, tag['tag']['name'], dest)
def get_virtual_servers(self): def get_virtual_servers(self):
'''Get all the CCI instances''' '''Get all the CCI instances'''