summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-18 16:38:59 -0400
committerGitHub <noreply@github.com>2017-07-18 16:38:59 -0400
commit25f5b7168eb5554dca5b91d63a4d21c724f04812 (patch)
treededca19620e33e62a5302076b39e3b0af22a9888
parentde24691d903d1cd0381f684fc8050673d2d81fd7 (diff)
parent28c97b01f5827cef2f2c5700cce56bb11b15d869 (diff)
downloadopenshift-25f5b7168eb5554dca5b91d63a4d21c724f04812.tar.gz
openshift-25f5b7168eb5554dca5b91d63a4d21c724f04812.tar.bz2
openshift-25f5b7168eb5554dca5b91d63a4d21c724f04812.tar.xz
openshift-25f5b7168eb5554dca5b91d63a4d21c724f04812.zip
Merge pull request #4786 from sdodson/enable_dnsmasq
Remove openshift_use_dnsmasq from aws and libvirt playbooks
-rw-r--r--playbooks/aws/openshift-cluster/config.yml1
-rw-r--r--playbooks/libvirt/openshift-cluster/config.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index 8d64b0521..821a0f30e 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -35,4 +35,3 @@
openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
- openshift_use_dnsmasq: false
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml
index 477213f4e..569e00da2 100644
--- a/playbooks/libvirt/openshift-cluster/config.yml
+++ b/playbooks/libvirt/openshift-cluster/config.yml
@@ -37,4 +37,3 @@
openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}"
openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}"
openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}"
- openshift_use_dnsmasq: false