Merge pull request #5241 from hansmi/master

Add variable to control whether NetworkManager hook is installed

roles/openshift_node_dnsmasq/README.md

@@ -0,0 +1,27 @@
+OpenShift Node DNS resolver
+===========================
+
+Configure dnsmasq to act as a DNS resolver for an OpenShift node.
+
+Requirements
+------------
+
+Role Variables
+--------------
+
+From this role:
+
+| Name                                                | Default value | Description                                                                       |
+|-----------------------------------------------------|---------------|-----------------------------------------------------------------------------------|
+| openshift_node_dnsmasq_install_network_manager_hook | true          | Install NetworkManager hook updating /etc/resolv.conf with local dnsmasq instance |
+
+Dependencies
+------------
+
+* openshift_common
+* openshift_node_facts
+
+License
+-------
+
+Apache License Version 2.0

roles/openshift_node_dnsmasq/defaults/main.yml

@@ -1 +1,2 @@
 ---
+openshift_node_dnsmasq_install_network_manager_hook: true

roles/openshift_node_dnsmasq/tasks/network-manager.yml

@@ -5,5 +5,6 @@
     dest: /etc/NetworkManager/dispatcher.d/
     mode: 0755
   notify: restart NetworkManager
+  when: openshift_node_dnsmasq_install_network_manager_hook | default(true) | bool
 
 - meta: flush_handlers

roles/openshift_sanitize_inventory/tasks/unsupported.yml

@@ -11,6 +11,14 @@
       will not function. This also means that NetworkManager must be installed
       enabled and responsible for management of the primary interface.
 
+- name: Ensure that openshift_node_dnsmasq_install_network_manager_hook is true
+  when:
+  - not openshift_node_dnsmasq_install_network_manager_hook | default(true) | bool
+  fail:
+    msg: |-
+      The NetworkManager hook is considered a critical part of the DNS
+      infrastructure.
+
 - set_fact:
     __using_dynamic: True
   when: