summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-01-20 16:14:03 -0500
committerGitHub <noreply@github.com>2017-01-20 16:14:03 -0500
commitc045e2efef32a067150eaf37a898bb8eb4a7b2c1 (patch)
treef1b738a5437a0f442b7430f47262a73450a42cbe /roles
parent30b1000c0f8a7347937eb9b02554e5126864a2b5 (diff)
parentab6ed9b280e2b596dfd16b9af33cf75355801ef6 (diff)
downloadopenshift-c045e2efef32a067150eaf37a898bb8eb4a7b2c1.tar.gz
openshift-c045e2efef32a067150eaf37a898bb8eb4a7b2c1.tar.bz2
openshift-c045e2efef32a067150eaf37a898bb8eb4a7b2c1.tar.xz
openshift-c045e2efef32a067150eaf37a898bb8eb4a7b2c1.zip
Merge pull request #3143 from abutcher/reorder-dnsmasq-config
Apply openshift_node_dnsmasq after os_firewall in node deps
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/meta/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml
index 91f118191..10036abed 100644
--- a/roles/openshift_node/meta/main.yml
+++ b/roles/openshift_node/meta/main.yml
@@ -17,8 +17,6 @@ dependencies:
- role: openshift_docker
- role: openshift_node_certificates
- role: openshift_cloud_provider
-- role: openshift_node_dnsmasq
- when: openshift.common.use_dnsmasq | bool
- role: os_firewall
os_firewall_allow:
- service: Kubernetes kubelet
@@ -43,3 +41,5 @@ dependencies:
- service: Kubernetes service NodePort UDP
port: "{{ openshift_node_port_range | default('') }}/udp"
when: openshift_node_port_range is defined
+- role: openshift_node_dnsmasq
+ when: openshift.common.use_dnsmasq | bool