diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-26 14:30:37 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-26 14:30:37 -0300 |
| commit | 14b23a8b14636407143375cbac71b090663cee77 (patch) | |
| tree | d81974e9cd0d4e2a2cef4b2bfef697835a0179aa /roles/openshift_common | |
| parent | c45ccc0ee879e93a4fd4304b4848595fa27014c5 (diff) | |
| download | openshift-14b23a8b14636407143375cbac71b090663cee77.tar.gz openshift-14b23a8b14636407143375cbac71b090663cee77.tar.bz2 openshift-14b23a8b14636407143375cbac71b090663cee77.tar.xz openshift-14b23a8b14636407143375cbac71b090663cee77.zip | |
Get rpm installations functional again.
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/roles/openshift_common/meta/main.yml b/roles/openshift_common/meta/main.yml index f1cf3e161..d3f8a343f 100644 --- a/roles/openshift_common/meta/main.yml +++ b/roles/openshift_common/meta/main.yml @@ -13,4 +13,4 @@ galaxy_info: - cloud dependencies: - role: openshift_facts -- role: openshift_repos +- role: openshift_docker diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index 4ec255dbc..d548daae6 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -29,17 +29,6 @@ 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: |