summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_dnsmasq
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-06-30 16:31:08 -0400
committerScott Dodson <sdodson@redhat.com>2016-07-01 09:52:08 -0400
commit31953e459c8cc4f8f819e05468e4fcbd13911237 (patch)
treec1894547804b1db6e413f5fdd1658d68c70c6419 /roles/openshift_node_dnsmasq
parent49b286608a060cdc5fca45008d01ac3c535ce314 (diff)
downloadopenshift-31953e459c8cc4f8f819e05468e4fcbd13911237.tar.gz
openshift-31953e459c8cc4f8f819e05468e4fcbd13911237.tar.bz2
openshift-31953e459c8cc4f8f819e05468e4fcbd13911237.tar.xz
openshift-31953e459c8cc4f8f819e05468e4fcbd13911237.zip
Add support for supplying a dnsmasq.conf file
Useful for POC environments where DNS may not actually be setup yet. Make sure you don't define anything that would conflict with the default configuration. You have been warned.
Diffstat (limited to 'roles/openshift_node_dnsmasq')
-rw-r--r--roles/openshift_node_dnsmasq/handlers/main.yml7
-rw-r--r--roles/openshift_node_dnsmasq/tasks/main.yml10
2 files changed, 16 insertions, 1 deletions
diff --git a/roles/openshift_node_dnsmasq/handlers/main.yml b/roles/openshift_node_dnsmasq/handlers/main.yml
index 7e9e4d299..7d43b6106 100644
--- a/roles/openshift_node_dnsmasq/handlers/main.yml
+++ b/roles/openshift_node_dnsmasq/handlers/main.yml
@@ -1,5 +1,10 @@
---
- name: restart NetworkManager
- service:
+ service:
name: NetworkManager
state: restarted
+
+- name: restart dnsmasq
+ service:
+ name: dnsmasq
+ state: restarted
diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml
index 7147b78f5..f8fa29a90 100644
--- a/roles/openshift_node_dnsmasq/tasks/main.yml
+++ b/roles/openshift_node_dnsmasq/tasks/main.yml
@@ -18,6 +18,16 @@
src: origin-dns.conf.j2
dest: /etc/dnsmasq.d/origin-dns.conf
+- name: Deploy additional dnsmasq.conf
+ template:
+ src: "{{ openshift_node_dnsmasq_additional_config_file }}"
+ dest: /etc/dnsmasq.d/openshift-ansible.conf
+ owner: root
+ group: root
+ mode: 0644
+ when: openshift_node_dnsmasq_additional_config_file is defined
+ notify: restart dnsmasq
+
# Dynamic NetworkManager based dispatcher
- include: ./network-manager.yml
when: network_manager_active | bool