diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-14 18:49:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 18:49:24 -0400 |
| commit | 65ffae3e6edc8902c591dfef792a505a16029698 (patch) | |
| tree | a28948529ce2a4c8b700aaf5352173be1aea8f8a /roles/openshift_common/tasks/main.yml | |
| parent | 1a6b1bf010b661feb8495d4088f9a0f2640b5658 (diff) | |
| parent | 03f31fdc581eea090388b5a60b3818167eb47c0c (diff) | |
| download | openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.gz openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.bz2 openshift-65ffae3e6edc8902c591dfef792a505a16029698.tar.xz openshift-65ffae3e6edc8902c591dfef792a505a16029698.zip | |
Merge pull request #1945 from dgoodwin/upgrade33
openshift_release / version / upgrade improvements
Diffstat (limited to 'roles/openshift_common/tasks/main.yml')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 4ec255dbc..ece335fbf 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -29,12 +29,8 @@ data_dir: "{{ openshift_data_dir | default(None) }}" use_dnsmasq: "{{ openshift_use_dnsmasq | default(None) }}" -# Using oo_image_tag_to_rpm_version here is a workaround for how -# openshift_version is set. That value is computed based on either RPM -# versions or image tags. openshift_common's usage requires that it be a RPM -# version and openshift_cli expects it to be an image tag. - name: Install the base package for versioning - action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" + action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" when: not openshift.common.is_containerized | bool - name: Set version facts @@ -49,3 +45,4 @@ command: > hostnamectl set-hostname {{ openshift.common.hostname }} when: openshift_set_hostname | default(set_hostname_default) | bool + |