summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-02 10:10:46 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-02 10:10:46 -0400
commit1ddfdd136f4b22368c87ad7656faa0cccdfa4a25 (patch)
tree45ba36d1d532552ffe906793cc8284fecaad198b /utils/src
parent7063a66354faebe143124ff275cbe04a56c03237 (diff)
downloadopenshift-1ddfdd136f4b22368c87ad7656faa0cccdfa4a25.tar.gz
openshift-1ddfdd136f4b22368c87ad7656faa0cccdfa4a25.tar.bz2
openshift-1ddfdd136f4b22368c87ad7656faa0cccdfa4a25.tar.xz
openshift-1ddfdd136f4b22368c87ad7656faa0cccdfa4a25.zip
Print info after upgrade completes.
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/cli_installer.py7
-rw-r--r--utils/src/ooinstall/install_transactions.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index daac5e388..978259f79 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -490,7 +490,12 @@ def upgrade(ctx):
old_variant, old_version, oo_cfg.settings['variant'],
oo_cfg.settings['variant_version']))
- install_transactions.run_upgrade_playbook()
+ retcode = install_transactions.run_upgrade_playbook()
+ if retcode > 0:
+ click.echo("Errors encountered during upgrade, please check %s." %
+ oo_cfg.settings['ansible_log_path'])
+ else:
+ click.echo("Upgrade completed! Rebooting all hosts is recommended.")
@click.command()
diff --git a/utils/src/ooinstall/install_transactions.py b/utils/src/ooinstall/install_transactions.py
index 1d1dbe340..0754b8ab6 100644
--- a/utils/src/ooinstall/install_transactions.py
+++ b/utils/src/ooinstall/install_transactions.py
@@ -143,6 +143,7 @@ def run_uninstall_playbook():
facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_config']
return run_ansible(playbook, inventory_file, facts_env)
+
def run_upgrade_playbook():
playbook = os.path.join(CFG.settings['ansible_playbook_directory'],
'playbooks/adhoc/upgrades/upgrade.yml')
@@ -154,3 +155,4 @@ def run_upgrade_playbook():
if 'ansible_config' in CFG.settings:
facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_config']
return run_ansible(playbook, inventory_file, facts_env)
+