skylab/skylab-ansible
Archived
2
0
Fork 0
Code Pull Requests Releases Activity

Reorganize network spec to more accurately reflect settings

Browse Source
This commit is contained in:
Ethan Paul
2021-11-06 21:37:15 -04:00
parent 2cff4e4354
commit fe0cd3ab67
4 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/server/templates/netdev.j2
View File

@@ -2,15 +2,15 @@
#
[NetDev]
Name={{ item.key }}
type={{ item.value.type }}
Kind={{ item.value.device }}
{% if item.value.type.lower() == 'bond' %}
{% if item.value.device.lower() == 'bond' %}
[Bond]
Mode={{ item.value.bond_mode | default('balance-rr') }}
PrimaryReselectPolicy=always
MIIMonitorSec=1s
{% endif %}
{% if item.value.type.lower() == 'vlan' %}
{% if item.value.device.lower() == 'vlan' %}
[VLAN]
Id={{ item.key.partition('.')[2] }}
{% endif %}

8
roles/server/templates/network.j2
View File

@@ -14,14 +14,16 @@ DNS={{ server }}
{% if item.value.bond is defined %}
Bond={{ item.value.bond }}
{% endif %}
{% if item.value.dhcp | default(false) %}
{% if not item.value.dhcp | default(false) %}
{% if item.value.gateway is defined %}
Gateway={{ item.value.gateway | ansible.netcommon.ipaddr('address') }}
{% for address in item.value.addresses %}
{% endif %}
{% for address in item.value.addresses | default([]) %}
Address={{ address | ansible.netcommon.ipaddr('host/prefix') }}
{% endfor %}
{% endif %}
{% for interface in skylab_networking.interfaces.keys() %}
{% for interface in skylab_networking.keys() %}
{% if interface.startswith(item.key) and interface.partition('.')[2] | regex_search('^[0-9]{1,4}$') and interface != item.key %}
VLAN={{ interface }}
{% endif %}