diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-20 08:21:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 08:21:13 -0400 |
| commit | e56778743abfc0d349ec8bead684389a7c253cc2 (patch) | |
| tree | 6e6886e1041a60e139ac6bc189bcc9ef105b0e55 | |
| parent | 4d13b05a2ad5bd97334aae78ad1f2c1d6bd9941b (diff) | |
| parent | 223d453e9c0dfef9021be8cbe3bf50f59d84aa52 (diff) | |
| download | openshift-e56778743abfc0d349ec8bead684389a7c253cc2.tar.gz openshift-e56778743abfc0d349ec8bead684389a7c253cc2.tar.bz2 openshift-e56778743abfc0d349ec8bead684389a7c253cc2.tar.xz openshift-e56778743abfc0d349ec8bead684389a7c253cc2.zip | |
Merge pull request #2183 from dgoodwin/mismatch-msg
Slight modification to error when using mismatched openshift_release.
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index d07fd5fbc..6e5d2b22c 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -76,7 +76,7 @@ # We can't map an openshift_release to full rpm version like we can with containers, make sure # the rpm version we looked up matches the release requested and error out if not. - fail: - msg: "Detected openshift version {{ openshift_version }} does not match requested openshift_release {{ openshift_release }}. You may need to adjust your yum repositories or specify an exact openshift_pkg_version." + msg: "Detected OpenShift version {{ openshift_version }} does not match requested openshift_release {{ openshift_release }}. You may need to adjust your yum repositories, inventory, or run the appropriate OpenShift upgrade playbook." when: not is_containerized | bool and openshift_release is defined and not openshift_version.startswith(openshift_release) | bool # The end result of these three variables is quite important so make sure they are displayed and logged: |