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
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index e0cb5d3..9d22a90 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -91,7 +91,12 @@
- 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 %}