summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-17 20:46:57 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-17 20:46:57 -0500
commit2783ca72870440e7c229150073d8812e86954571 (patch)
treee57a445727a9f4d827b8b46159af7eab8831ac40 /playbooks/common
parent2b90af359e535f4761305399d59f413b461189cd (diff)
parentc92c263aadf1346cb7e8f41e943b48ffd45e20f2 (diff)
downloadopenshift-2783ca72870440e7c229150073d8812e86954571.tar.gz
openshift-2783ca72870440e7c229150073d8812e86954571.tar.bz2
openshift-2783ca72870440e7c229150073d8812e86954571.tar.xz
openshift-2783ca72870440e7c229150073d8812e86954571.zip
Merge pull request #1065 from lebauce/flannel-fixes
Use inventory value when checking for flannel
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-node/config.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 69ccb0cb8..d1a5ee817 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -16,6 +16,7 @@
hostname: "{{ openshift_hostname | default(None) }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
deployment_type: "{{ openshift_deployment_type }}"
+ use_flannel: "{{ openshift_use_flannel | default(None) }}"
- role: node
local_facts:
labels: "{{ openshift_node_labels | default(None) }}"