diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-01-22 23:00:00 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-01-22 23:00:00 +0100 |
| commit | 40cd1c17fd4d3a2e40406e81ce5ee1015dab892b (patch) | |
| tree | 31e5b05c85c115989e2b9cda2e459fedfdf7a17b /roles/elevate | |
| parent | fix idempotence (diff) | |
renumbered citiycom vlan ids
Diffstat (limited to 'roles/elevate')
5 files changed, 11 insertions, 11 deletions
diff --git a/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 b/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 index b799548a..987117c8 100644 --- a/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 +++ b/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 @@ -19,8 +19,8 @@ LAN_IF="{{ network.primary.interface }}" LAN_IPADDR="{{ network.primary.ip }}" LAN_NETMASK="{{ network.primary.mask }}" -EXT_IF="{{ network.primary.interface }}.{{ network_zones.dom.vlan }}" -EXT_IPADDR="{{ network_zones.dom.prefix | ipaddr(network_zones.dom.offsets[inventory_hostname]) | ipaddr('address') }}" +EXT_IF="{{ network.primary.interface }}.{{ network_zones.ccinet.vlan }}" +EXT_IPADDR="{{ network_zones.ccinet.prefix | ipaddr(network_zones.ccinet.offsets[inventory_hostname]) | ipaddr('address') }}" EXT_SERVICES_TCP="80 443 22000" EXT_SERVICES_UDP="" diff --git a/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 b/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 index ca1f1b21..687dc65d 100644 --- a/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 +++ b/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 @@ -19,7 +19,7 @@ LAN_IF="{{ network.primary.interface }}" LAN_IPADDR="{{ network.primary.ip }}" LAN_NETMASK="{{ network.primary.mask }}" -EXT_IF="{{ network.primary.interface }}.{{ network_zones.dom.vlan }}" +EXT_IF="{{ network.primary.interface }}.{{ network_zones.ccinet.vlan }}" EXT_IPADDR="89.106.211.61" EXT_SERVICES_TCP="80 443 22000" diff --git a/roles/elevate/media/templates/firewall/r3.sh.j2 b/roles/elevate/media/templates/firewall/r3.sh.j2 index f8685b4f..c38e4048 100644 --- a/roles/elevate/media/templates/firewall/r3.sh.j2 +++ b/roles/elevate/media/templates/firewall/r3.sh.j2 @@ -15,7 +15,7 @@ MANGLE="$IPTABLES -t mangle" FILTER6="$IP6TABLES -t filter" MANGLE6="$IP6TABLES -t mangle" -EXT_IF="{{ network.primary.interface }}.{{ network_zones.dom.vlan }}" +EXT_IF="{{ network.primary.interface }}" EXT_IPADDR="89.106.211.61" EXT_SERVICES_TCP="80 443 22000" diff --git a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 index 40370cf6..350753f6 100644 --- a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 +++ b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 @@ -6,12 +6,12 @@ network: addresses: [ {{ (network.primary.ip + '/' + network.primary.mask) | ipaddr('address/prefix') }} ] accept-ra: false vlans: - {{ network.primary.interface }}.{{ network_zones.dom.vlan }}: - id: {{ network_zones.dom.vlan }} + {{ network.primary.interface }}.{{ network_zones.ccinet.vlan }}: + id: {{ network_zones.ccinet.vlan }} link: {{ network.primary.interface }} - addresses: [ {{ network_zones.dom.prefix | ipaddr(network_zones.dom.offsets[inventory_hostname]) | ipaddr('address/prefix') }} ] - gateway4: {{ network_zones.dom.gw }} + addresses: [ {{ network_zones.ccinet.prefix | ipaddr(network_zones.ccinet.offsets[inventory_hostname]) | ipaddr('address/prefix') }} ] + gateway4: {{ network_zones.ccinet.gw }} accept-ra: false nameservers: search: [ {{ network.domain }} ] - addresses: {{ network_zones.dom.dns | to_json }} + addresses: {{ network_zones.ccinet.dns | to_json }} diff --git a/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 b/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 index 087c9b54..275ef953 100644 --- a/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 +++ b/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 @@ -6,8 +6,8 @@ network: addresses: [ {{ (network.primary.ip + '/' + network.primary.mask) | ipaddr('address/prefix') }} ] accept-ra: false vlans: - {{ network.primary.interface }}.{{ network_zones.dom.vlan }}: - id: {{ network_zones.dom.vlan }} + {{ network.primary.interface }}.{{ network_zones.ccinet.vlan }}: + id: {{ network_zones.ccinet.vlan }} link: {{ network.primary.interface }} addresses: [ 89.106.211.61/27 ] gateway4: 89.106.211.33 |