diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-06-23 10:42:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 10:42:24 -0400 |
| commit | 4ee7f6fd40e3fbead666770f1041a7c9ba1465fe (patch) | |
| tree | fdf5a1a1ec19bd65df695161e0dcae08a77faab3 | |
| parent | f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d (diff) | |
| parent | 45a0439eba8413053fd66bdbd521519d65b14ff1 (diff) | |
| download | openshift-4ee7f6fd40e3fbead666770f1041a7c9ba1465fe.tar.gz openshift-4ee7f6fd40e3fbead666770f1041a7c9ba1465fe.tar.bz2 openshift-4ee7f6fd40e3fbead666770f1041a7c9ba1465fe.tar.xz openshift-4ee7f6fd40e3fbead666770f1041a7c9ba1465fe.zip | |
Merge pull request #2074 from tbielawa/networkmgr_changed
NetworkManager service never changes
| -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 - |