Skip to content

Commit

Permalink
Only pass the retcode out to salt-call if retcode_passthrough is
Browse files Browse the repository at this point in the history
set, first fix for #4904
  • Loading branch information
thatch45 committed May 13, 2013
1 parent a745edf commit 4b5c3e6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
24 changes: 22 additions & 2 deletions doc/topics/tutorials/cloud_controller.rst
Expand Up @@ -67,6 +67,8 @@ hypervisor and is bridged to an active network device.
To use more advanced networking in Salt Virt read the `Salt Virt
Networking` document:

`Salt Virt Networking <topics/virt/nic>`

Libvirt State
-------------

Expand All @@ -84,8 +86,26 @@ date:
libvirt_keys:
libvirt.keys
Getting Virtual Machine Images Ready
====================================

Salt Virt, requires that virtual machine images be provided as these are not
generated on the fly. Generating these virtual machine images differs greatly
based on the underlying platform.

Virtual machine images can be manually created using KVM and running through
the installer, but this process is not recommended since it is very manual and
prone to errors.

Virtual Machine generation applications are avilable for many platforms:

vm-builder:
http://wiki.debian.org/VMBuilder

Using Salt Virt
===============

With hypervisors funcitoning Salt can start to query and deploy virtual
machines.
With hypervisors set up and virtual machine images ready, Salt can start
issuing cloud commands.

Start by deploying
3 changes: 2 additions & 1 deletion salt/cli/caller.py
Expand Up @@ -171,4 +171,5 @@ def run(self):
out,
ret.get('out', 'nested'),
self.opts)
sys.exit(ret['retcode'])
if self.opts.get('retcode_passthrough', False):
sys.exit(ret['retcode'])

0 comments on commit 4b5c3e6

Please sign in to comment.