From 2c608429d81bbe5979cc083c7746219d154e7421 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Mon, 28 Mar 2016 21:58:48 -0400 Subject: 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 --- roles/openshift_cli/meta/main.yml | 3 ++- roles/openshift_cli/tasks/main.yml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'roles/openshift_cli') diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml index 62de120c6..2c982e278 100644 --- a/roles/openshift_cli/meta/main.yml +++ b/roles/openshift_cli/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: categories: - cloud dependencies: -- role: openshift_common - role: openshift_docker when: openshift.common.is_containerized | bool +- role: openshift_common +- role: openshift_cli_facts 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 -- cgit v1.2.3