diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-13 13:02:32 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-13 13:02:32 -0300 |
| commit | ef37abd3dd236d1c7129527a057ca2ac6377cb75 (patch) | |
| tree | 9c8e35035730f0443ee29528f4b924e3b49d4384 | |
| parent | 3e850ad3a64c81031d928a18b7cef0bc7c3cd184 (diff) | |
| download | openshift-ef37abd3dd236d1c7129527a057ca2ac6377cb75.tar.gz openshift-ef37abd3dd236d1c7129527a057ca2ac6377cb75.tar.bz2 openshift-ef37abd3dd236d1c7129527a057ca2ac6377cb75.tar.xz openshift-ef37abd3dd236d1c7129527a057ca2ac6377cb75.zip | |
Fix rpm installs.
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 16 | ||||
| -rw-r--r-- | roles/openshift_version/tasks/set_version_rpm.yml | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index c67f6b86a..ca1a9b1e4 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -41,4 +41,3 @@ no_proxy: "{{ openshift_no_proxy | default(None) }}" generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}" no_proxy_internal_hostnames: "{{ openshift_no_proxy_internal_hostnames | default(None) }}" - version_requested: "{{ openshift_version | default(None) }}" diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index 29724a9e5..e27add09e 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -9,11 +9,6 @@ openshift_version: "{{ openshift_version }}" when: openshift_version is defined -- debug: var=openshift_version -- debug: var=openshift_release -- debug: var=openshift_pkg_version -- debug: var=openshift_image_tag - # Protect the installed version by default unless explicitly told not to, or given an # openshift_version already. - name: Use openshift.common.version fact as version to configure if already installed @@ -21,13 +16,20 @@ openshift_version: "{{ openshift.common.version }}" when: openshift.common.version is defined and openshift_version is not defined and openshift_protect_installed_version +- debug: var=is_containerized +- debug: var=openshift_version +- debug: msg="{{ openshift_version is defined }}" +- debug: var=openshift_release +- debug: var=openshift_pkg_version +- debug: var=openshift_image_tag + - name: Set openshift_version for rpm installation include: set_version_rpm.yml - when: not is_containerized + when: not is_containerized | bool - name: Set openshift_version for containerized installation include: set_version_containerized.yml - when: is_containerized + when: is_containerized | bool - debug: var=openshift_version diff --git a/roles/openshift_version/tasks/set_version_rpm.yml b/roles/openshift_version/tasks/set_version_rpm.yml index bcf275135..b15f0e993 100644 --- a/roles/openshift_version/tasks/set_version_rpm.yml +++ b/roles/openshift_version/tasks/set_version_rpm.yml @@ -7,6 +7,8 @@ openshift_version: "{{ openshift_pkg_version[1:].split('-')[0] }}" when: openshift_pkg_version is defined and openshift_version is not defined +- debug: var=openshift_version + - name: Gather common package version command: > {{ repoquery_cmd }} --qf '%{version}' "{{ openshift.common.service_type}}" |