summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_dnsmasq
diff options
context:
space:
mode:
authorMichael Hanselmann <hansmi@vshn.ch>2017-08-28 13:32:29 +0200
committerMichael Hanselmann <hansmi@vshn.ch>2017-10-19 11:03:02 +0200
commita4ac8fbe3c33e51ce21c99cc12b29a28727954cd (patch)
treebaf39f6051e371fecbcbb46741c99716d96f771b /roles/openshift_node_dnsmasq
parent64f452f9081e380db41acf588a28fe4bb79a4e9e (diff)
downloadopenshift-a4ac8fbe3c33e51ce21c99cc12b29a28727954cd.tar.gz
openshift-a4ac8fbe3c33e51ce21c99cc12b29a28727954cd.tar.bz2
openshift-a4ac8fbe3c33e51ce21c99cc12b29a28727954cd.tar.xz
openshift-a4ac8fbe3c33e51ce21c99cc12b29a28727954cd.zip
Add variable to control whether NetworkManager hook is installed
We control /etc/resolv.conf and parts of the dnsmasq configuration via Puppet in our environment. The hook ends up overwriting the managed configuration.
Diffstat (limited to 'roles/openshift_node_dnsmasq')
-rw-r--r--roles/openshift_node_dnsmasq/README.md27
-rw-r--r--roles/openshift_node_dnsmasq/defaults/main.yml1
-rw-r--r--roles/openshift_node_dnsmasq/tasks/network-manager.yml1
3 files changed, 29 insertions, 0 deletions
diff --git a/roles/openshift_node_dnsmasq/README.md b/roles/openshift_node_dnsmasq/README.md
new file mode 100644
index 000000000..4596190d7
--- /dev/null
+++ b/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
diff --git a/roles/openshift_node_dnsmasq/defaults/main.yml b/roles/openshift_node_dnsmasq/defaults/main.yml
index ed97d539c..eae832fcf 100644
--- a/roles/openshift_node_dnsmasq/defaults/main.yml
+++ b/roles/openshift_node_dnsmasq/defaults/main.yml
@@ -1 +1,2 @@
---
+openshift_node_dnsmasq_install_network_manager_hook: true
diff --git a/roles/openshift_node_dnsmasq/tasks/network-manager.yml b/roles/openshift_node_dnsmasq/tasks/network-manager.yml
index dddcfc9da..e5a92a630 100644
--- a/roles/openshift_node_dnsmasq/tasks/network-manager.yml
+++ b/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