diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-17 04:32:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 04:32:14 -0500 |
| commit | 0090be3aa291b7c02190928dea96ffbaa3faf1ce (patch) | |
| tree | 9bc72be057dc637f100a24741d2aa09f55419c45 /roles | |
| parent | 415b1233d09c2f38dffe3b73b59152f2fadd1888 (diff) | |
| parent | 08b62ee738bcee211c1cb1c6eade26932bd4a97a (diff) | |
| download | openshift-0090be3aa291b7c02190928dea96ffbaa3faf1ce.tar.gz openshift-0090be3aa291b7c02190928dea96ffbaa3faf1ce.tar.bz2 openshift-0090be3aa291b7c02190928dea96ffbaa3faf1ce.tar.xz openshift-0090be3aa291b7c02190928dea96ffbaa3faf1ce.zip | |
Merge pull request #4189 from giuseppe/fix-atomic-host
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index 2e9b4cad3..f2f4d16f0 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -3,6 +3,7 @@ - set_fact: is_containerized: "{{ openshift.common.is_containerized | default(False) | bool }}" + is_atomic: "{{ openshift.common.is_atomic | default(False) | bool }}" # Block attempts to install origin without specifying some kind of version information. # This is because the latest tags for origin are usually alpha builds, which should not @@ -86,9 +87,11 @@ include: set_version_rpm.yml when: not is_containerized | bool +- name: Set openshift_version for containerized installation + include: set_version_containerized.yml + when: is_containerized | bool + - block: - - name: Set openshift_version for containerized installation - include: set_version_containerized.yml - name: Get available {{ openshift.common.service_type}} version repoquery: name: "{{ openshift.common.service_type}}" @@ -104,7 +107,9 @@ 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 + when: + - is_containerized | bool + - not is_atomic | bool # Warn if the user has provided an openshift_image_tag but is not doing a containerized install # NOTE: This will need to be modified/removed for future container + rpm installations work. |