Permalink
Browse files

Merge pull request #30084 from rallytime/bp-29987

Back-port #29987 to 2015.8
  • Loading branch information...
cachedout committed Dec 30, 2015
2 parents 654cab0 + 16e1df9 commit 5602b8833e1240206bbfc69806abd4766f8bdd4a
Showing with 6 additions and 9 deletions.
  1. +6 −9 salt/cloud/cli.py
View
@@ -81,10 +81,9 @@ def run(self):
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 @@ def run(self):
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):

0 comments on commit 5602b88

Please sign in to comment.