Merge pull request #1857 from sdodson/dns-upgrade

Playbook to enable dnsmasq

5 files changed, 86 insertions, 0 deletions

diff --git a/playbooks/common/openshift-master/library/modify_yaml.py b/library/modify_yaml.py
index a4be10ca3..a4be10ca3 100755
--- a/playbooks/common/openshift-master/library/modify_yaml.py
+++ b/library/modify_yaml.py
diff --git a/playbooks/byo/openshift-cluster/enable_dnsmasq.yml b/playbooks/byo/openshift-cluster/enable_dnsmasq.yml
new file mode 100644
index 000000000..1c8d99341
--- /dev/null
+++ b/playbooks/byo/openshift-cluster/enable_dnsmasq.yml
@@ -0,0 +1,18 @@
+---
+- hosts: localhost
+  connection: local
+  become: no
+  gather_facts: no
+  tasks:
+  - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml
+  - add_host:
+      name: "{{ item }}"
+      groups: l_oo_all_hosts
+    with_items: g_all_hosts
+
+- hosts: l_oo_all_hosts
+  gather_facts: no
+  tasks:
+  - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml
+  
+- include: ../../common/openshift-cluster/enable_dnsmasq.yml
diff --git a/playbooks/common/openshift-cluster/enable_dnsmasq.yml b/playbooks/common/openshift-cluster/enable_dnsmasq.yml
new file mode 100644
index 000000000..f2bcc872f
--- /dev/null
+++ b/playbooks/common/openshift-cluster/enable_dnsmasq.yml
@@ -0,0 +1,66 @@
+---
+- include: evaluate_groups.yml
+
+- name: Load openshift_facts
+  hosts: oo_masters_to_config:oo_nodes_to_config
+  roles:
+  - openshift_facts
+  post_tasks:
+  - fail: msg="This playbook requires a master version of at least Origin 1.1 or OSE 3.1"
+    when: not openshift.common.version_gte_3_1_1_or_1_1_1 | bool
+  
+- name: Reconfigure masters to listen on our new dns_port
+  hosts: oo_masters_to_config
+  handlers:
+  - include: ../../../roles/openshift_master/handlers/main.yml
+  vars:
+    os_firewall_allow:
+    - service: skydns tcp
+      port: "{{ openshift.master.dns_port }}/tcp"
+    - service: skydns udp
+      port: "{{ openshift.master.dns_port }}/udp"
+  roles:
+  - os_firewall
+  tasks:
+  - openshift_facts:
+      role: "{{ item.role }}"
+      local_facts: "{{ item.local_facts }}"
+    with_items:
+    - role: common
+      local_facts:
+        use_dnsmasq: True
+    - role: master
+      local_facts:
+        dns_port: '8053'
+  - modify_yaml:
+      dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+      yaml_key: dnsConfig.bindAddress
+      yaml_value: "{{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }}"
+    notify: restart master
+  - meta: flush_handlers
+
+- name: Configure nodes for dnsmasq
+  hosts: oo_nodes_to_config
+  handlers:
+  - include: ../../../roles/openshift_node/handlers/main.yml
+  pre_tasks:
+  - openshift_facts:
+      role: "{{ item.role }}"
+      local_facts: "{{ item.local_facts }}"
+    with_items:
+    - role: common
+      local_facts:
+        use_dnsmasq: True
+    - role: node
+      local_facts:
+        dns_ip: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
+  vars:
+    openshift_deployment_type: "{{ deployment_type }}"
+  roles:
+    - openshift_node_dnsmasq
+  post_tasks:
+  - modify_yaml:
+      dest: "{{ openshift.common.config_base }}/node/node-config.yaml"
+      yaml_key: dnsIP
+      yaml_value: "{{ openshift.node.dns_ip }}"
+    notify: restart node
diff --git a/playbooks/common/openshift-cluster/library b/playbooks/common/openshift-cluster/library
new file mode 120000
index 000000000..d0b7393d3
--- /dev/null
+++ b/playbooks/common/openshift-cluster/library
@@ -0,0 +1 @@
+../../../library/
\ No newline at end of file
diff --git a/playbooks/common/openshift-master/library b/playbooks/common/openshift-master/library
new file mode 120000
index 000000000..d0b7393d3
--- /dev/null
+++ b/playbooks/common/openshift-master/library
@@ -0,0 +1 @@
+../../../library/
\ No newline at end of file