Merge branch 'rhnetwork' into 'master'

RedHat network support: set default proto: according OS default

'protocol' part of network configuration is different in Debian vs RedHat.

current value 'static' isn't compatible with RedHat OSes see: http://pydoc.net/Python/salt/2014.7.0/salt.modules.rh_ip/ - 'none' should be set instead

See merge request !11

linux/network/interface.sls

@@ -91,7 +91,12 @@ linux_interface_{{ interface_name }}:
   - name: {{ interface_name }}
   - type: {{ interface.type }}
   {%- if interface.address is defined %}
+  {%- if grains.os_family == 'Debian' %}
   - proto: {{ interface.get('proto', 'static') }}
+  {% endif %}
+  {%- if grains.os_family == 'RedHat' %}
+  - proto: {{ interface.get('proto', 'none') }}
+  {% endif %}
   - ipaddr: {{ interface.address }}
   - netmask: {{ interface.netmask }}
   {%- else %}