summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
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 /playbooks/common/openshift-cluster
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 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/initialize_facts.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml
index 4bf5d33b1..e90a49390 100644
--- a/playbooks/common/openshift-cluster/initialize_facts.yml
+++ b/playbooks/common/openshift-cluster/initialize_facts.yml
@@ -115,6 +115,7 @@
debug_level: "{{ openshift_debug_level | default(2) }}"
deployment_type: "{{ openshift_deployment_type }}"
deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}"
+ cli_image: "{{ osm_image | default(None) }}"
cluster_id: "{{ openshift_cluster_id | default('default') }}"
hostname: "{{ openshift_hostname | default(None) }}"
ip: "{{ openshift_ip | default(None) }}"