diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-06 14:33:17 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-06 15:28:57 -0400 |
| commit | 0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd (patch) | |
| tree | 11dc01a86a97acfbe6e9ee4d9ae477eda8ece490 /playbooks/adhoc/upgrades/files | |
| parent | e250f4712eecace09ee37bcfa116206e765d0076 (diff) | |
| download | openshift-0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd.tar.gz openshift-0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd.tar.bz2 openshift-0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd.tar.xz openshift-0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd.zip | |
Minor upgrade improvements.
Skip some 3.1 checks if doing a 3.0.x to 3.0.2 upgrade.
Improve error message when oc whoami fails (i.e. openshift is down) during
pre-upgrade checks, rather than assuming the binary doesn't exist.
Diffstat (limited to 'playbooks/adhoc/upgrades/files')
| -rw-r--r-- | playbooks/adhoc/upgrades/files/pre-upgrade-check | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/playbooks/adhoc/upgrades/files/pre-upgrade-check b/playbooks/adhoc/upgrades/files/pre-upgrade-check index c8ecae399..ed4ab6d1b 100644 --- a/playbooks/adhoc/upgrades/files/pre-upgrade-check +++ b/playbooks/adhoc/upgrades/files/pre-upgrade-check @@ -131,8 +131,11 @@ def main(): print "found" except: print( - 'Can not find oc (%s). Override the path with the ' - 'OC_PATH environment variable. Exiting...' % OC_PATH) + 'Unable to run "%s whoami"\n' + 'Please ensure OpenShift is running, and "oc" is on your system ' + 'path.\n' + 'You can override the path with the OC_PATH environment variable.' + % OC_PATH) raise SystemExit(1) # Where the magic happens |