From 73bf3e7137d80ba5b225108f39240c43d385a1ea Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 27 Nov 2017 12:22:02 -0500 Subject: Combine openshift_node and openshift_node_dnsmasq This commit combines these two roles. This will prevent openshift_node_facts from running twice. --- roles/openshift_node/defaults/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'roles/openshift_node/defaults') diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 62208c155..5a0c09f5c 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -1,6 +1,13 @@ --- openshift_node_debug_level: "{{ debug_level | default(2) }}" +openshift_node_dnsmasq_install_network_manager_hook: true + +# lo must always be present in this list or dnsmasq will conflict with +# the node's dns service. +openshift_node_dnsmasq_except_interfaces: +- lo + r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" -- cgit v1.2.1