valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #113 from techhat/develop

Browse Source 
Change salt-cloud to use the new outputter system (in 0.10.5)
This commit is contained in:
Thomas S Hatch 2012-11-02 09:00:28 -07:00
commit 1f1ac1597b
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
saltcloud/cli.py
View File

@ -208,29 +208,16 @@ class SaltCloud(object):
mapper = saltcloud.cloud.Map(self.opts)
if self.opts['query'] or self.opts['full_query']:
get_outputter = salt.output.get_outputter
if self.opts['raw_out']:
printout = get_outputter('raw')
elif self.opts['json_out']:
printout = get_outputter('json')
elif self.opts['txt_out']:
printout = get_outputter('txt')
elif self.opts['yaml_out']:
printout = get_outputter('yaml')
else:
printout = get_outputter(None)
query = 'list_nodes'
if self.opts['full_query']:
query = 'list_nodes_full'
color = not bool(self.opts['no_color'])
query_map = {}
if self.opts['map']:
query_map = mapper.interpolated_map(query=query)
else:
query_map = mapper.map_providers(query=query)
printout(query_map, color=color)
salt.output.display_output(query_map, '', self.opts)
if self.opts['version']:
print VERSION

4
saltcloud/loader.py
View File

@ -8,11 +8,9 @@ import os
import salt.loader
import saltcloud
salt.loader.salt_base_path = os.path.dirname(saltcloud.__file__)
def clouds(opts):
'''
Return the cloud functions
'''
load = salt.loader._create_loader(opts, 'clouds', 'cloud')
load = salt.loader._create_loader(opts, 'clouds', 'cloud', base_path=os.path.dirname(saltcloud.__file__))
return load.gen_functions()