Combine openshift_node and openshift_node_dnsmasq

This commit combines these two roles.  This will
prevent openshift_node_facts from running twice.

playbooks/byo/openshift-cluster/enable_dnsmasq.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/evaluate_groups.yml
-
-- include: ../../common/openshift-cluster/enable_dnsmasq.yml

playbooks/common/openshift-cluster/enable_dnsmasq.yml

@@ -1,55 +0,0 @@
----
-- name: Load openshift_facts
-  hosts: oo_masters_to_config:oo_nodes_to_config
-  roles:
-  - openshift_facts
-
-- name: Reconfigure masters to listen on our new dns_port
-  hosts: oo_masters_to_config
-  handlers:
-  - include: ../../../roles/openshift_master/handlers/main.yml
-    static: yes
-  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: 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 api
-  - meta: flush_handlers
-
-- name: Configure nodes for dnsmasq
-  hosts: oo_nodes_to_config
-  handlers:
-  - include: ../../../roles/openshift_node/handlers/main.yml
-    static: yes
-  pre_tasks:
-  - openshift_facts:
-      role: "{{ item.role }}"
-      local_facts: "{{ item.local_facts }}"
-    with_items:
-    - role: node
-      local_facts:
-        dns_ip: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
-  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

roles/openshift_node/defaults/main.yml

@@ -1,6 +1,13 @@
 ---
 openshift_node_debug_level: "{{ debug_level | default(2) }}"
 
+openshift_node_dnsmasq_install_network_manager_hook: true
+
+# lo must always be present in this list or dnsmasq will conflict with
+# the node's dns service.
+openshift_node_dnsmasq_except_interfaces:
+- lo
+
 r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
 r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
 

roles/openshift_node/handlers/main.yml

@@ -1,4 +1,15 @@
 ---
+- name: restart NetworkManager
+  systemd:
+    name: NetworkManager
+    state: restarted
+    enabled: True
+
+- name: restart dnsmasq
+  systemd:
+    name: dnsmasq
+    state: restarted
+
 - name: restart openvswitch
   systemd:
     name: openvswitch

roles/openshift_node/meta/main.yml

@@ -22,6 +22,5 @@ dependencies:
 - role: openshift_docker
 - role: openshift_cloud_provider
   when: not (openshift_node_upgrade_in_progress | default(False))
-- role: openshift_node_dnsmasq
 - role: lib_utils
   when: openshift_node_upgrade_in_progress | default(False)

roles/openshift_node_dnsmasq/tasks/main.yml

@@ -59,9 +59,9 @@
     state: started
 
 # Dynamic NetworkManager based dispatcher
-- include_tasks: ./network-manager.yml
+- include_tasks: dnsmasq/network-manager.yml
   when: network_manager_active | bool
 
 # Relies on ansible in order to configure static config
-- include_tasks: ./no-network-manager.yml
+- include_tasks: dnsmasq/no-network-manager.yml
   when: not network_manager_active | bool

roles/openshift_node/tasks/main.yml

@@ -6,6 +6,8 @@
     - deployment_type == 'openshift-enterprise'
     - not openshift_use_crio | default(false)
 
+- include: dnsmasq.yml
+
 - name: setup firewall
   import_tasks: firewall.yml
 

roles/openshift_node/tasks/upgrade.yml

@@ -179,5 +179,4 @@
   retries: 24
   delay: 5
 
-- include_role:
-    name: openshift_node_dnsmasq
+- include_tasks: dnsmasq.yml

roles/openshift_node_dnsmasq/README.md

@@ -1,27 +0,0 @@
-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

roles/openshift_node_dnsmasq/defaults/main.yml

@@ -1,7 +0,0 @@
----
-openshift_node_dnsmasq_install_network_manager_hook: true
-
-# lo must always be present in this list or dnsmasq will conflict with
-# the node's dns service.
-openshift_node_dnsmasq_except_interfaces:
-- lo

roles/openshift_node_dnsmasq/handlers/main.yml

@@ -1,11 +0,0 @@
----
-- name: restart NetworkManager
-  systemd:
-    name: NetworkManager
-    state: restarted
-    enabled: True
-
-- name: restart dnsmasq
-  systemd:
-    name: dnsmasq
-    state: restarted

roles/openshift_node_dnsmasq/meta/main.yml

@@ -1,15 +0,0 @@
----
-galaxy_info:
-  author: Scott Dodson
-  description: OpenShift Node DNSMasq support
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 2.2
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-dependencies:
-- role: openshift_node_facts