diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
| commit | dd2506e325d1a2858da353f96251f093e94bbcf3 (patch) | |
| tree | 132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /roles/openshift_node_dnsmasq | |
| parent | f004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff) | |
| parent | bf520e46e6916a4c9995ea95fa40cdd25f31209e (diff) | |
| download | openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2 openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_node_dnsmasq')
| -rw-r--r-- | roles/openshift_node_dnsmasq/tasks/main.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_node_dnsmasq/tasks/main.yml b/roles/openshift_node_dnsmasq/tasks/main.yml index 4cb24469d..7147b78f5 100644 --- a/roles/openshift_node_dnsmasq/tasks/main.yml +++ b/roles/openshift_node_dnsmasq/tasks/main.yml @@ -3,15 +3,16 @@ command: > systemctl show NetworkManager register: nm_show - + changed_when: false + - name: Set fact using_network_manager set_fact: network_manager_active: "{{ True if 'ActiveState=active' in nm_show.stdout else False }}" - + - name: Install dnsmasq action: "{{ ansible_pkg_mgr }} name=dnsmasq state=installed" when: not openshift.common.is_atomic | bool - + - name: Install dnsmasq configuration template: src: origin-dns.conf.j2 @@ -20,8 +21,7 @@ # Dynamic NetworkManager based dispatcher - include: ./network-manager.yml when: network_manager_active | bool - + # Relies on ansible in order to configure static config - include: ./no-network-manager.yml when: not network_manager_active | bool - |