diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-30 16:31:08 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-07-01 09:52:08 -0400 |
| commit | 31953e459c8cc4f8f819e05468e4fcbd13911237 (patch) | |
| tree | c1894547804b1db6e413f5fdd1658d68c70c6419 | |
| parent | 49b286608a060cdc5fca45008d01ac3c535ce314 (diff) | |
| download | openshift-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.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 5 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 5 | ||||
| -rw-r--r-- | roles/openshift_node_dnsmasq/handlers/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_node_dnsmasq/tasks/main.yml | 10 |
4 files changed, 24 insertions, 3 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 7c9c7152b..ef5488d67 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -381,7 +381,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults # to True for Origin 1.2 and OSE 3.2. False for 1.1 / 3.1 installs, this cannot # be used with 1.0 and 3.0. -# openshift_use_dnsmasq=False +#openshift_use_dnsmasq=False +# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf +# This is useful for POC environments where DNS may not actually be available yet. +#openshift_node_dnsmasq_additional_config_file=/home/bob/ose-dnsmasq.conf # Global Proxy Configuration # These options configure HTTP_PROXY, HTTPS_PROXY, and NOPROXY environment diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 55f9fa66c..b4c6ff9b5 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -376,7 +376,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults # to True for Origin 1.2 and OSE 3.2. False for 1.1 / 3.1 installs, this cannot # be used with 1.0 and 3.0. -# openshift_use_dnsmasq=False +#openshift_use_dnsmasq=False +# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf +# This is useful for POC environments where DNS may not actually be available yet. +#openshift_node_dnsmasq_additional_config_file=/home/bob/ose-dnsmasq.conf # Global Proxy Configuration # These options configure HTTP_PROXY, HTTPS_PROXY, and NOPROXY environment 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 |