From 31953e459c8cc4f8f819e05468e4fcbd13911237 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 30 Jun 2016 16:31:08 -0400 Subject: 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. --- roles/openshift_node_dnsmasq/handlers/main.yml | 7 ++++++- roles/openshift_node_dnsmasq/tasks/main.yml | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'roles/openshift_node_dnsmasq') 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 -- cgit v1.2.1 From 3f51b9847508ed0334d6d5c9d5717e83578668ba Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 1 Jul 2016 14:14:37 -0400 Subject: Restart dnsmasq encase it was already running --- roles/openshift_node_dnsmasq/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/openshift_node_dnsmasq') diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml index f8fa29a90..bd9a0ffb6 100644 --- a/roles/openshift_node_dnsmasq/tasks/main.yml +++ b/roles/openshift_node_dnsmasq/tasks/main.yml @@ -17,6 +17,7 @@ template: src: origin-dns.conf.j2 dest: /etc/dnsmasq.d/origin-dns.conf + notify: restart dnsmasq - name: Deploy additional dnsmasq.conf template: -- cgit v1.2.1