renumbered citiycom vlan ids

7 files changed, 18 insertions, 18 deletions

diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml
index 1144c068..1221e8a2 100644
--- a/inventory/group_vars/elevate-festival/main.yml
+++ b/inventory/group_vars/elevate-festival/main.yml
@@ -67,8 +67,8 @@ network_zones:
       start: 100
       limit: 199
 
-  dom:
-    vlan: 91
+  ccinet:
+    vlan: 128
     prefix: 85.237.28.224/28
     gw: 85.237.28.225
     dns:
@@ -79,8 +79,8 @@ network_zones:
       ele-router: 4
       ele-media: 5
 
-  forum:
-    vlan: 109
+  ccemc:
+    vlan: 129
     prefix: 85.237.28.192/28
     gw: 85.237.28.193
     dns:
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index a4bcd4ce..6a3a906e 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -1,5 +1,5 @@
 ---
-network_wan_zone: "{{ network_zones.dom }}"
+network_wan_zone: "{{ network_zones.ccinet }}"
 network_mgmt_zone: "{{ network_zones.mgmt }}"
 network_internal_zone_names:
   - lan
@@ -12,14 +12,14 @@ openwrt_network_external:
   - name: switch_vlan
     options:
       device: 'switch0'
-      ## for some reason vlan-id 91 does not work. why??
+      ## for some reason vlan-id 128 does not work. why??
       # vlan: '{{ network_wan_zone.vlan }}'
       vlan: '1'
       ports: '2 3 4 6t'
 
   - name: interface 'wan'
     options:
-      ## for some reason vlan-id 91 does not work. why??
+      ## for some reason vlan-id 128 does not work. why??
       # ifname: 'eth0.{{ network_wan_zone.vlan }}'
       ifname: 'eth0.1'
       proto: dhcp
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