diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 10:34:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 10:34:12 -0500 |
| commit | b9ab765528ff2e7f9aa46b6942d74027ef9b6799 (patch) | |
| tree | 446766a541618590b79ff263e5edc5de580ec25a /roles/openshift_node/tasks/dnsmasq | |
| parent | c7645af60a5411af83b04fb6a5617887d3b39183 (diff) | |
| parent | 73bf3e7137d80ba5b225108f39240c43d385a1ea (diff) | |
| download | openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.gz openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.bz2 openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.tar.xz openshift-b9ab765528ff2e7f9aa46b6942d74027ef9b6799.zip | |
Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-node
Combine openshift_node and openshift_node_dnsmasq
Diffstat (limited to 'roles/openshift_node/tasks/dnsmasq')
| -rw-r--r-- | roles/openshift_node/tasks/dnsmasq/network-manager.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/dnsmasq/no-network-manager.yml | 11 |
2 files changed, 21 insertions, 0 deletions
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 |