summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli_facts
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_facts
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_facts')
-rw-r--r--roles/openshift_cli_facts/meta/main.yml15
-rw-r--r--roles/openshift_cli_facts/tasks/main.yml6
2 files changed, 21 insertions, 0 deletions
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) }}"