diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-11-27 12:22:02 -0500 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-11-27 14:08:58 -0500 |
commit | 73bf3e7137d80ba5b225108f39240c43d385a1ea (patch) | |
tree | 79c46afb0932d1c3fa56c476aa8f586aaf15db8e /roles/openshift_node_dnsmasq/tasks | |
parent | e7e699a4201754fe9ccd1b9adffad5be5fff18b3 (diff) | |
download | openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.gz openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.bz2 openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.tar.xz openshift-73bf3e7137d80ba5b225108f39240c43d385a1ea.zip |
Combine openshift_node and openshift_node_dnsmasq
This commit combines these two roles. This will
prevent openshift_node_facts from running twice.
Diffstat (limited to 'roles/openshift_node_dnsmasq/tasks')
-rw-r--r-- | roles/openshift_node_dnsmasq/tasks/main.yml | 67 | ||||
-rw-r--r-- | roles/openshift_node_dnsmasq/tasks/network-manager.yml | 10 | ||||
-rw-r--r-- | roles/openshift_node_dnsmasq/tasks/no-network-manager.yml | 11 |
3 files changed, 0 insertions, 88 deletions
diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml deleted file mode 100644 index a33b78780..000000000 --- a/roles/openshift_node_dnsmasq/tasks/main.yml +++ /dev/null @@ -1,67 +0,0 @@ ---- -- name: Check for NetworkManager service - command: > - systemctl show NetworkManager - register: nm_show - changed_when: false - ignore_errors: True - -- name: Set fact using_network_manager - set_fact: - network_manager_active: "{{ True if 'ActiveState=active' in nm_show.stdout else False }}" - -- name: Install dnsmasq - package: name=dnsmasq state=installed - when: not openshift.common.is_atomic | bool - -- name: ensure origin/node directory exists - file: - state: directory - path: "{{ item }}" - owner: root - group: root - mode: '0700' - with_items: - - /etc/origin - - /etc/origin/node - -# this file is copied to /etc/dnsmasq.d/ when the node starts and is removed -# when the node stops. A dbus-message is sent to dnsmasq to add the same entries -# so that dnsmasq doesn't need to be restarted. Once we can use dnsmasq 2.77 or -# newer we can use --server-file option to update the servers dynamically and -# reload them by sending dnsmasq a SIGHUP. We write the file in case someone else -# triggers a restart of dnsmasq but not a node restart. -- name: Install node-dnsmasq.conf - template: - src: node-dnsmasq.conf.j2 - dest: /etc/origin/node/node-dnsmasq.conf - -- name: Install dnsmasq configuration - template: - src: origin-dns.conf.j2 - dest: /etc/dnsmasq.d/origin-dns.conf - notify: restart dnsmasq - -- 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 - -- name: Enable dnsmasq - systemd: - name: dnsmasq - enabled: yes - state: started - -# Dynamic NetworkManager based dispatcher -- include_tasks: ./network-manager.yml - when: network_manager_active | bool - -# Relies on ansible in order to configure static config -- include_tasks: ./no-network-manager.yml - when: not network_manager_active | bool diff --git a/roles/openshift_node_dnsmasq/tasks/network-manager.yml b/roles/openshift_node_dnsmasq/tasks/network-manager.yml deleted file mode 100644 index e5a92a630..000000000 --- a/roles/openshift_node_dnsmasq/tasks/network-manager.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: Install network manager dispatch script - copy: - src: networkmanager/99-origin-dns.sh - dest: /etc/NetworkManager/dispatcher.d/ - mode: 0755 - notify: restart NetworkManager - when: openshift_node_dnsmasq_install_network_manager_hook | default(true) | bool - -- meta: flush_handlers diff --git a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml deleted file mode 100644 index dede2fb8f..000000000 --- a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- fail: msg="Currently, NetworkManager must be installed and enabled prior to installation." - when: not openshift_node_bootstrap | bool - -- name: Install NetworkManager during node_bootstrap provisioning - package: - name: NetworkManager - state: present - notify: restart NetworkManager - -- include_tasks: network-manager.yml |