fixed issues with output format and order key
This commit is contained in:
parent
a132e00cdc
commit
23a66c8344
1 changed files with 5 additions and 4 deletions
|
@ -76,6 +76,8 @@ except ImportError:
|
||||||
# server, so it does not attempt to login with a username and password.
|
# server, so it does not attempt to login with a username and password.
|
||||||
# this will be addressed in a future version of this script.
|
# this will be addressed in a future version of this script.
|
||||||
|
|
||||||
|
orderby_keyname = 'owners' # alternatively 'mgmt_classes'
|
||||||
|
|
||||||
|
|
||||||
class CobblerInventory(object):
|
class CobblerInventory(object):
|
||||||
|
|
||||||
|
@ -104,13 +106,12 @@ class CobblerInventory(object):
|
||||||
|
|
||||||
# Data to print
|
# Data to print
|
||||||
if self.args.host:
|
if self.args.host:
|
||||||
data_to_print = self.get_host_info()
|
data_to_print += self.get_host_info()
|
||||||
else:
|
else:
|
||||||
self.inventory['_meta'] = { 'hostvars': {} }
|
self.inventory['_meta'] = { 'hostvars': {} }
|
||||||
for hostname in self.cache:
|
for hostname in self.cache:
|
||||||
self.inventory['_meta']['hostvars'][hostname] = {'cobbler': self.cache[hostname] }
|
self.inventory['_meta']['hostvars'][hostname] = {'cobbler': self.cache[hostname] }
|
||||||
|
data_to_print += self.json_format_dict(self.inventory, True)
|
||||||
data_to_print += self.json_format_dict(self.inventory, True)
|
|
||||||
|
|
||||||
print data_to_print
|
print data_to_print
|
||||||
|
|
||||||
|
@ -180,7 +181,7 @@ class CobblerInventory(object):
|
||||||
|
|
||||||
status = host['status']
|
status = host['status']
|
||||||
profile = host['profile']
|
profile = host['profile']
|
||||||
classes = host['owners'] #host['mgmt_classes']
|
classes = host[orderby_keyname] #host['mgmt_classes']
|
||||||
|
|
||||||
if status not in self.inventory:
|
if status not in self.inventory:
|
||||||
self.inventory[status] = []
|
self.inventory[status] = []
|
||||||
|
|
Loading…
Reference in a new issue