|
|
@ -132,8 +132,6 @@ def configinstall(args, mode): |
|
|
|
try: |
|
|
|
try: |
|
|
|
configinstall_onehost(host, args, mode, parallel=False) |
|
|
|
configinstall_onehost(host, args, mode, parallel=False) |
|
|
|
except cdist.Error as e: |
|
|
|
except cdist.Error as e: |
|
|
|
# FIXME: save the error and display at the end? |
|
|
|
|
|
|
|
# Would be non-consistent to parallel mode |
|
|
|
|
|
|
|
failed_hosts.append(host) |
|
|
|
failed_hosts.append(host) |
|
|
|
|
|
|
|
|
|
|
|
# Catch errors in parallel mode when joining |
|
|
|
# Catch errors in parallel mode when joining |
|
|
@ -171,6 +169,7 @@ def configinstall_onehost(host, args, mode, parallel): |
|
|
|
context.cleanup() |
|
|
|
context.cleanup() |
|
|
|
|
|
|
|
|
|
|
|
except cdist.Error as e: |
|
|
|
except cdist.Error as e: |
|
|
|
|
|
|
|
# We are running in our own process here, need to sys.exit! |
|
|
|
if parallel: |
|
|
|
if parallel: |
|
|
|
log.error(e) |
|
|
|
log.error(e) |
|
|
|
sys.exit(1) |
|
|
|
sys.exit(1) |
|
|
|