From 73bf3e7137d80ba5b225108f39240c43d385a1ea Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Mon, 27 Nov 2017 12:22:02 -0500 Subject: Combine openshift_node and openshift_node_dnsmasq This commit combines these two roles. This will prevent openshift_node_facts from running twice. --- roles/openshift_node/tasks/dnsmasq/network-manager.yml | 10 ++++++++++ roles/openshift_node/tasks/dnsmasq/no-network-manager.yml | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 roles/openshift_node/tasks/dnsmasq/network-manager.yml create mode 100644 roles/openshift_node/tasks/dnsmasq/no-network-manager.yml (limited to 'roles/openshift_node/tasks/dnsmasq') diff --git a/roles/openshift_node/tasks/dnsmasq/network-manager.yml b/roles/openshift_node/tasks/dnsmasq/network-manager.yml new file mode 100644 index 000000000..e5a92a630 --- /dev/null +++ b/roles/openshift_node/tasks/dnsmasq/network-manager.yml @@ -0,0 +1,10 @@ +--- +- 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/tasks/dnsmasq/no-network-manager.yml b/roles/openshift_node/tasks/dnsmasq/no-network-manager.yml new file mode 100644 index 000000000..dede2fb8f --- /dev/null +++ b/roles/openshift_node/tasks/dnsmasq/no-network-manager.yml @@ -0,0 +1,11 @@ +--- +- 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 -- cgit v1.2.1