diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-23 16:08:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:08:20 -0600 |
| commit | 066494438d5baff9f555cd56a8bde94df148dc31 (patch) | |
| tree | e0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_node | |
| parent | d740fd159416783c88839e6e2c2e150eb81b67da (diff) | |
| parent | c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff) | |
| download | openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2 openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip | |
Merge branch 'master' into fix_logging_jks_gen
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 4 |
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 |