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_facts/meta/main.yml | 15 +++++++++++++++ roles/openshift_cli_facts/tasks/main.yml | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 roles/openshift_cli_facts/meta/main.yml create mode 100644 roles/openshift_cli_facts/tasks/main.yml (limited to 'roles/openshift_cli_facts') diff --git a/roles/openshift_cli_facts/meta/main.yml b/roles/openshift_cli_facts/meta/main.yml new file mode 100644 index 000000000..59acde215 --- /dev/null +++ b/roles/openshift_cli_facts/meta/main.yml @@ -0,0 +1,15 @@ +--- +galaxy_info: + author: Jason DeTiberus + description: OpenShift CLI Facts + company: Red Hat, Inc. + license: Apache License, Version 2.0 + min_ansible_version: 1.9 + platforms: + - name: EL + versions: + - 7 + categories: + - cloud +dependencies: +- role: openshift_facts diff --git a/roles/openshift_cli_facts/tasks/main.yml b/roles/openshift_cli_facts/tasks/main.yml new file mode 100644 index 000000000..dd1ed8965 --- /dev/null +++ b/roles/openshift_cli_facts/tasks/main.yml @@ -0,0 +1,6 @@ +--- +# TODO: move this to a new 'cli' role +- openshift_facts: + role: common + local_facts: + cli_image: "{{ osm_image | default(None) }}" -- cgit v1.2.3