diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 16:34:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 16:34:59 -0500 |
| commit | 9a405010c5a656f89866906d29866ba98493e91b (patch) | |
| tree | b9bcd798419a79a5517d9b1f6909f88f98179e7c /roles/openshift_node_dnsmasq | |
| parent | dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532 (diff) | |
| parent | bf19d26f2be591b9cb4e3379c015bfe5f31b4f0a (diff) | |
| download | openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.gz openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.bz2 openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.xz openshift-9a405010c5a656f89866906d29866ba98493e91b.zip | |
Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-node
Include Deprecation - openshift-node
Diffstat (limited to 'roles/openshift_node_dnsmasq')
| -rw-r--r-- | roles/openshift_node_dnsmasq/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node_dnsmasq/tasks/no-network-manager.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml index 9bbaafc29..a33b78780 100644 --- a/roles/openshift_node_dnsmasq/tasks/main.yml +++ b/roles/openshift_node_dnsmasq/tasks/main.yml @@ -59,9 +59,9 @@ state: started # Dynamic NetworkManager based dispatcher -- include: ./network-manager.yml +- include_tasks: ./network-manager.yml when: network_manager_active | bool # Relies on ansible in order to configure static config -- include: ./no-network-manager.yml +- include_tasks: ./no-network-manager.yml when: not network_manager_active | bool diff --git a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml index 8a7da66c2..dede2fb8f 100644 --- a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml +++ b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml @@ -8,4 +8,4 @@ state: present notify: restart NetworkManager -- include: ./network-manager.yml +- include_tasks: network-manager.yml |