From e1e9108ac462c80c2777863060240f54af509142 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 22 Nov 2017 20:26:23 -0600
Subject: [PATCH] NM support

---
 roles/network/tasks/NM-debian.yml   | 37 +++++++++++++++++++++++++++++
 roles/network/tasks/down-debian.yml | 25 +++++++++++++++++++
 roles/network/tasks/main.yml        |  6 +++++
 3 files changed, 68 insertions(+)
 create mode 100644 roles/network/tasks/NM-debian.yml
 create mode 100644 roles/network/tasks/down-debian.yml

diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
new file mode 100644
index 000000000..b5795c73e
--- /dev/null
+++ b/roles/network/tasks/NM-debian.yml
@@ -0,0 +1,37 @@
+# NM-debian.yml
+- include_tasks: down-debian.yml
+# provide keyfile layout like the XO's used way back.
+- name: Create uuid for NM
+  shell: uuidgen
+  register: uuid_response
+
+- name: Put the uuid in place
+  set_fact:
+    gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
+
+# NM might have a watcher on this path and we don't have to restart NM
+- name: Copy the bridge script for has_NM
+  template:
+    dest: /etc/NetworkManager/system-connections/
+    src: network/bridge-br0
+
+- name: Reload systemd
+  shell: systemctl daemon-reload
+
+- name: Restart the networking service
+  service:
+    name: network-manager
+    state: restarted
+  when: not nobridge is defined and not no_net_restart
+  
+- name: Restart hostapd when WiFi is present
+  service:
+    name: hostapd
+    state: restarted
+  when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"
+
+- name: dhcp_server may be affected - starting - user choice
+  service:
+    name: "{{ dhcp_service2 }}"
+    state: started
+  when: iiab_network_mode != "Appliance"
diff --git a/roles/network/tasks/down-debian.yml b/roles/network/tasks/down-debian.yml
new file mode 100644
index 000000000..393d7fd4e
--- /dev/null
+++ b/roles/network/tasks/down-debian.yml
@@ -0,0 +1,25 @@
+# down-debian.yml
+
+#- name: Supply resolvconf.conf
+#  template:
+#     dest: /etc/resolvconf.conf
+#    src: network/resolvconf.j2
+
+- name: bind may be affected
+  service:
+    name: "{{ dns_service }}"
+    state: stopped
+  when: named_install and dnsmasq_enabled
+
+# dhcpd_server release the interface
+- name: dhcpd_server may be affected - stopping dhcpd
+  service:
+    name: dhcpd
+    state: stopped
+  when: dhcpd_install
+
+- name: dhcpd_server may be affected - stopping dnsmasq
+  service:
+    name: dnsmasq
+    state: stopped
+  when: dnsmasq_install
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 52f32beaf..f180bb62e 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -90,6 +90,12 @@
     - network
   when: is_redhat and not installing
 
+- include_tasks: NM-debian.yml
+  tags:
+    - network
+  when: is_debuntu and has_NM
+#and not installing
+
 - include_tasks: debian.yml
   tags:
     - network