Merge branch 'nm' into 'master'

NetworkManager

support for option to disable NetworkManager service.

(on some _servers_ you need to do it for some kinds of configuration)

tested on Ubuntu & Centos

See merge request !12

README.rst

@@ -226,7 +226,7 @@ Linux with default static network interfaces, default gateway interface and DNS
             - 8.8.4.4
             mtu: 1500
 
-Linux with bonded interfaces
+Linux with bonded interfaces and disabled NetworkManager
 
 .. code-block:: yaml
 
@@ -249,6 +249,8 @@ Linux with bonded interfaces
             use_in:
             - interface: ${linux:interface:eth0}
             - interface: ${linux:interface:eth0}
+        network_manager:
+          disable: true
 
 Linux with vlan interface_params
 

linux/network/interface.sls

@@ -20,10 +20,6 @@ linux_network_bridge_pkgs:
 
 {%- endif %}
 
-{%- if not network.network_manager %}
-
-{# TODO stop/disable/uninstall network manager #}
-
 {%- for interface_name, interface in network.interface.iteritems() %}
 
 {%- if interface.get('managed', True) %}
@@ -215,4 +211,8 @@ linux_network_{{ interface_name }}_routes:
 
 {%- endif %}
 
+{%- if network.network_manager.disable is defined and network.network_manager.disable == True %}
+NetworkManager:
+  service.dead:
+  - enable: false
 {%- endif %}