saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30084 from rallytime/bp-29987

Browse source 
Back-port #29987 to 2015.8
This commit is contained in:
Mike Place 2015-12-30 11:19:09 -07:00
commit 5602b8833e
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/cloud/cli.py
View file

@ -81,10 +81,9 @@ class SaltCloud(parsers.SaltCloudParser):
if self.options.update_bootstrap:
ret = salt.utils.cloud.update_bootstrap(self.config)
display_output = salt.output.get_printout(
self.options.output, self.config
)
print(display_output(ret))
salt.output.display_output(ret,
self.options.output,
opts=self.config)
self.exit(salt.defaults.exitcodes.EX_OK)
log.info('salt-cloud starting')
@ -357,11 +356,9 @@ class SaltCloud(parsers.SaltCloudParser):
else:
self.error('Nothing was done. Using the proper arguments?')
display_output = salt.output.get_printout(
self.options.output, self.config
)
# display output using salt's outputter system
print(display_output(ret))
salt.output.display_output(ret,
self.options.output,
opts=self.config)
self.exit(salt.defaults.exitcodes.EX_OK)
def print_confirm(self, msg):