diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-06 15:59:29 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-11-06 15:59:29 -0500 |
| commit | e38eae135ac4957576b263c3cc8f50e9805ea937 (patch) | |
| tree | a93f4b7a06b7be0706d6e604cdd0b6bfc2684b73 /playbooks/adhoc/upgrades/files | |
| parent | eec5e61daf1bd0ef773c21180ae642fafe23e3df (diff) | |
| parent | 0cfb416780b9e86c26eafd62ee6b99cd2a46b7cd (diff) | |
| download | openshift-e38eae135ac4957576b263c3cc8f50e9805ea937.tar.gz openshift-e38eae135ac4957576b263c3cc8f50e9805ea937.tar.bz2 openshift-e38eae135ac4957576b263c3cc8f50e9805ea937.tar.xz openshift-e38eae135ac4957576b263c3cc8f50e9805ea937.zip | |
Merge remote-tracking branch 'dgoodwin/pre-upgrade' into upgradeFix2
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 |