summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--playbooks/adhoc/upgrades/upgrade.yml5
-rw-r--r--utils/src/ooinstall/cli_installer.py1
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index dab0195ac..c0fdab027 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -52,9 +52,12 @@
- stat: path=/var/lib/openshift
register: var_lib_openshift
+ - stat: path=/var/lib/origin
+ register: var_lib_origin
+
- name: Create origin symlink if necessary
file: src=/var/lib/openshift/ dest=/var/lib/origin state=link
- when: var_lib_openshift.stat.exists == True
+ when: var_lib_openshift.stat.exists == True and var_lib_origin.stat.exists == False
- name: Check available disk space for etcd backup
# We assume to be using the data dir for all backups.
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index e63f14816..0d65f2053 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -526,6 +526,7 @@ def upgrade(ctx):
click.echo("Errors encountered during upgrade, please check %s." %
oo_cfg.settings['ansible_log_path'])
else:
+ oo_cfg.save_to_disk()
click.echo("Upgrade completed! Rebooting all hosts is recommended.")