diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-10 15:12:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 15:12:28 +0200 |
| commit | 87c282b612ee53441e7564f53ac49a1a6624d820 (patch) | |
| tree | 2f1fa15f1d35f461eeac7e7e007a6dfb3b8f0e65 /roles/openshift_version/tasks/main.yml | |
| parent | 574724e544eb92dafdc24e96e15564f7d143b35e (diff) | |
| parent | 7563ac56340015ce62e49b9cdbda063ed6721857 (diff) | |
| download | openshift-87c282b612ee53441e7564f53ac49a1a6624d820.tar.gz openshift-87c282b612ee53441e7564f53ac49a1a6624d820.tar.bz2 openshift-87c282b612ee53441e7564f53ac49a1a6624d820.tar.xz openshift-87c282b612ee53441e7564f53ac49a1a6624d820.zip | |
Merge pull request #4033 from ingvagabund/report-docker-image-version-and-excluder-rpm-version
[RFE] report and fail if rpm version differs from docker image version
Diffstat (limited to 'roles/openshift_version/tasks/main.yml')
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index fa9b20e92..d8b1158a6 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -86,8 +86,16 @@ include: set_version_rpm.yml when: not is_containerized | bool -- name: Set openshift_version for containerized installation - include: set_version_containerized.yml +- block: + - name: Set openshift_version for containerized installation + include: set_version_containerized.yml + - name: Determine openshift rpm version + include: rpm_version.yml + - name: Fail if rpm version and docker image version are different + fail: + msg: "OCP rpm version {{ openshift_rpm_version }} is different from OCP image version {{ openshift_version }}" + # Both versions have the same string representation + when: openshift_rpm_version != openshift_version when: is_containerized | bool # Warn if the user has provided an openshift_image_tag but is not doing a containerized install |