summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli/tasks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-03-28 21:58:48 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-03-31 15:34:41 -0400
commit2c608429d81bbe5979cc083c7746219d154e7421 (patch)
tree961149cce5c0202c42e4c12802d3ba92dface6ff /roles/openshift_cli/tasks
parentf716f083d656132fe87b8d398e776661209be0e9 (diff)
downloadopenshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.gz
openshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.bz2
openshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.xz
openshift-2c608429d81bbe5979cc083c7746219d154e7421.zip
Bug 1320829 - Ensure docker installed for facts
- gather facts requiring docker only if docker is present and running - Update reference to etcd role in playbooks/common/openshift-etcd/config.yml to use openshift_etcd
Diffstat (limited to 'roles/openshift_cli/tasks')
-rw-r--r--roles/openshift_cli/tasks/main.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml
index e82903b81..bfa60e5b0 100644
--- a/roles/openshift_cli/tasks/main.yml
+++ b/roles/openshift_cli/tasks/main.yml
@@ -1,10 +1,4 @@
---
-# TODO: move this to a new 'cli' role
-- openshift_facts:
- role: common
- local_facts:
- cli_image: "{{ osm_image | default(None) }}"
-
- name: Install clients
action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-clients state=present"
when: not openshift.common.is_containerized | bool