diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 11:47:50 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 11:47:50 -0300 |
| commit | 88839ab89210ecd3d20d1f10f8f03bf0a801502a (patch) | |
| tree | f0816491f80f7ac5839259323785782e222f66a3 /roles/openshift_common | |
| parent | 81cb935e1817df4c633397680e963d635ed42e26 (diff) | |
| download | openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.gz openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.bz2 openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.tar.xz openshift-88839ab89210ecd3d20d1f10f8f03bf0a801502a.zip | |
Do not install rpm for version in openshift_version role.
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/roles/openshift_common/meta/main.yml b/roles/openshift_common/meta/main.yml index d3f8a343f..cd8c75ec5 100644 --- a/roles/openshift_common/meta/main.yml +++ b/roles/openshift_common/meta/main.yml @@ -13,4 +13,5 @@ galaxy_info: - cloud dependencies: - role: openshift_facts -- role: openshift_docker +- role: openshift_repos +- role: openshift_version diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index d548daae6..4ec255dbc 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -29,6 +29,17 @@ 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" + when: not openshift.common.is_containerized | bool + +- name: Set version facts + openshift_facts: + # For enterprise versions < 3.1 and origin versions < 1.1 we want to set the # hostname by default. - set_fact: |