fix hosts_with_var_set script

This commit is contained in:
Brendan Early 2020-02-25 21:46:25 -06:00 committed by Pierre-Yves Chibon
parent 0690270c69
commit 60b360e9e1

View file

@ -23,7 +23,7 @@ parser.add_option('-a', action="store_true", dest='all_vars', default=None,
opts, args = parser.parse_args(sys.argv[1:]) opts, args = parser.parse_args(sys.argv[1:])
if ((opts.variable == None and opts.all_vars == None) or (opts.variable != None and opts.all_vars != None)): if ((opts.variable == None and opts.all_vars == None) or (opts.variable != None and opts.all_vars != None)):
print "Usage: hosts_with_var_set -o varname[=value] | -a" print("Usage: hosts_with_var_set -o varname[=value] | -a")
sys.exit(-1) sys.exit(-1)
loader = DataLoader() loader = DataLoader()
@ -41,16 +41,15 @@ if opts.variable != None:
value = "None" value = "None"
var_set = [] var_set = []
for host in inv.get_hosts():
for host in sorted(inv.get_hosts()):
vars = variable_manager.get_vars(host=host) vars = variable_manager.get_vars(host=host)
if opts.variable == None: if opts.variable == None:
# remove expanded 'all' groups # remove expanded 'all' groups
vars.pop('groups') vars.pop('groups')
vars['groups'] = host.get_groups() vars['groups'] = host.get_groups()
print "%s\n%s\n" % (host.get_name(),vars) print("%s\n%s\n" % (host.get_name(), vars))
else: else:
if vars.has_key(var_name): if var_name in vars:
if not matching: if not matching:
var_set.append(host.get_name()) var_set.append(host.get_name())
else: else:
@ -59,10 +58,8 @@ for host in sorted(inv.get_hosts()):
if opts.variable != None: if opts.variable != None:
if not matching: if not matching:
print 'hosts with variable %s:' % var_name print('hosts with variable %s:' % var_name)
else: else:
print 'hosts with variable %s matching %s value' % (var_name,value) print('hosts with variable %s matching %s value' % (var_name, value))
for host in sorted(var_set): for host in sorted(var_set):
print host print(host)