Merge branch 'vlans' into 'master'
VLAN networking support
this should add VLAN networking setup.
from DOCs..
```
bond0.10:
network.managed:
- type: vlan
- ipaddr: 10.1.0.4
- use:
- network: bond0
- require:
- network: bond0
```
See merge request !9
diff --git a/README.rst b/README.rst
index c3e2e32..bd9d7f2 100644
--- a/README.rst
+++ b/README.rst
@@ -223,6 +223,19 @@
- interface: ${linux:interface:eth0}
- interface: ${linux:interface:eth0}
+Linux with vlan interface_params
+
+.. code-block:: yaml
+
+ linux:
+ network:
+ enabled: true
+ interface:
+ vlan69:
+ type: vlan
+ use_interfaces:
+ - interface: ${linux:interface:bond0}
+
Linux with wireless interface parameters
.. code-block:: yaml
@@ -231,7 +244,7 @@
network:
enabled: true
gateway: 10.0.0.1
- default_interface: eth0
+ default_interface: eth0
interface:
wlan0:
type: eth
@@ -249,7 +262,7 @@
network:
enabled: true
gateway: 10.0.0.1
- default_interface: eth0
+ default_interface: eth0
interface:
eth0:
type: eth
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 70d7d3d..a97fc13 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -126,6 +126,16 @@
- network: linux_interface_{{ network }}
{%- endfor %}
{%- endif %}
+ {%- if interface.type == 'vlan' %}
+ - use:
+ {%- for network in interface.use_interfaces %}
+ - network: {{ network }}
+ {%- endfor %}
+ - require:
+ {%- for network in interface.use_interfaces %}
+ - network: {{ network }}
+ {%- endfor %}
+ {%- endif %}
{%- if interface.gateway is defined %}