upgrade-zulip-stage-2: Abort upgrade if puppet will not run cleanly.

This commit is contained in:
Alex Vandiver 2023-01-31 12:41:24 -05:00 committed by Tim Abbott
parent fd47f6296e
commit 20841d9b65
1 changed files with 3 additions and 0 deletions

View File

@ -416,6 +416,9 @@ if not args.skip_puppet and IS_SERVER_UP:
logging.info("No puppet changes found, skipping!") logging.info("No puppet changes found, skipping!")
args.skip_puppet = True args.skip_puppet = True
has_puppet_changes = False has_puppet_changes = False
elif try_puppet.returncode == 2:
logging.error("Puppet error -- aborting!")
sys.exit(1)
elif minimal_change: elif minimal_change:
logging.error("Would need to apply puppet changes -- aborting!") logging.error("Would need to apply puppet changes -- aborting!")
sys.exit(1) sys.exit(1)