summaryrefslogtreecommitdiffstats
path: root/roles/openshift_cli_facts
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-08-23 15:23:03 -0400
committerMichael Gugino <mgugino@redhat.com>2017-08-25 08:55:49 -0400
commit53028f806e86b2985e79e9103ffbc78ce83b6d57 (patch)
treef2fd5ea40d6da1222e20c72a24fb71dd5d9dceda /roles/openshift_cli_facts
parentb8e45471aa70881ff608962f0fec236c31c2398d (diff)
downloadopenshift-53028f806e86b2985e79e9103ffbc78ce83b6d57.tar.gz
openshift-53028f806e86b2985e79e9103ffbc78ce83b6d57.tar.bz2
openshift-53028f806e86b2985e79e9103ffbc78ce83b6d57.tar.xz
openshift-53028f806e86b2985e79e9103ffbc78ce83b6d57.zip
Remove near-meta role openshift_cli_facts
openshift_cli_facts only runs a single task, and otherwise the only existence is to serve as a link in the dependency chain towards openshift_facts. This commit flattens openshift_cli into one role.
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, 0 insertions, 21 deletions
diff --git a/roles/openshift_cli_facts/meta/main.yml b/roles/openshift_cli_facts/meta/main.yml
deleted file mode 100644
index 59acde215..000000000
--- a/roles/openshift_cli_facts/meta/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-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
deleted file mode 100644
index dd1ed8965..000000000
--- a/roles/openshift_cli_facts/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# TODO: move this to a new 'cli' role
-- openshift_facts:
- role: common
- local_facts:
- cli_image: "{{ osm_image | default(None) }}"