Explorar el Código

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
tags/2016.12
Filip Pytloun hace 9 años
padre
commit
0a0da4078b
Se han modificado 2 ficheros con 25 adiciones y 2 borrados
  1. +15
    -2
      README.rst
  2. +10
    -0
      linux/network/interface.sls

+ 15
- 2
README.rst Ver fichero

@@ -223,6 +223,19 @@ Linux with bonded interfaces
- 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 @@ Linux with wireless interface parameters
network:
enabled: true
gateway: 10.0.0.1
default_interface: eth0
default_interface: eth0
interface:
wlan0:
type: eth
@@ -249,7 +262,7 @@ Linux networks with routes defined
network:
enabled: true
gateway: 10.0.0.1
default_interface: eth0
default_interface: eth0
interface:
eth0:
type: eth

+ 10
- 0
linux/network/interface.sls Ver fichero

@@ -126,6 +126,16 @@ linux_interface_{{ interface_name }}:
- 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 %}


Cargando…
Cancelar
Guardar