summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2016-03-16 15:48:02 -0400
committerKenny Woodson <kwoodson@redhat.com>2016-03-16 15:48:02 -0400
commit8c4c2680146982bdf98442b02303517f5cc79001 (patch)
tree214b643af4fa83985435a8204c17d1c0d3aa6e70
parent1b126acc91526949e9eae23d850419bfadcf51ce (diff)
parent2907c7bb56ec94a97c76158232794ffd5e765f1a (diff)
downloadopenshift-8c4c2680146982bdf98442b02303517f5cc79001.tar.gz
openshift-8c4c2680146982bdf98442b02303517f5cc79001.tar.bz2
openshift-8c4c2680146982bdf98442b02303517f5cc79001.tar.xz
openshift-8c4c2680146982bdf98442b02303517f5cc79001.zip
Merge pull request #1628 from abutcher/deployment-type
Add default deployment_type to openshift_facts.
-rw-r--r--roles/openshift_facts/tasks/main.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 89ddb0d98..50e7e5747 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -25,7 +25,8 @@
openshift_facts:
role: common
local_facts:
- deployment_type: "{{ openshift_deployment_type }}"
+ # TODO: Deprecate deployment_type in favor of openshift_deployment_type
+ deployment_type: "{{ openshift_deployment_type | default(deployment_type) }}"
cluster_id: "{{ openshift_cluster_id | default('default') }}"
hostname: "{{ openshift_hostname | default(None) }}"
ip: "{{ openshift_ip | default(None) }}"