gw vs. gateway

22 files changed, 37 insertions, 37 deletions

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index d5e93a5f..73aa2975 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -3,7 +3,7 @@ network_zones:
   lan:
     vlan: 28
     prefix: 192.168.28.0/24
-    gw: 192.168.28.254
+    gateway: 192.168.28.254
     dns:
       - 192.168.28.254
     dhcp:
@@ -33,7 +33,7 @@ network_zones:
   svc:
     vlan: 32
     prefix: 192.168.32.0/24
-    gw: 192.168.32.254
+    gateway: 192.168.32.254
     dns:
 #      - 192.168.32.254
       - 9.9.9.9
@@ -61,7 +61,7 @@ network_zones:
   magenta:
     vlan: 329
     prefix: 62.99.185.128/30
-    gw: 62.99.185.129
+    gateway: 62.99.185.129
     dns:
       - 195.58.160.194
       - 195.58.161.122
diff --git a/inventory/group_vars/dolmetsch-ctl/main.yml b/inventory/group_vars/dolmetsch-ctl/main.yml
index d1ffc8ae..97b58bb1 100644
--- a/inventory/group_vars/dolmetsch-ctl/main.yml
+++ b/inventory/group_vars/dolmetsch-ctl/main.yml
@@ -146,5 +146,5 @@ openwrt_uci:
         proto: static
         ipaddr: "{{ network_mixer_zone.prefix | ipaddr(network_mixer_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_mixer_zone.prefix | ipaddr('netmask') }}"
-        gateway: "{{ network_mixer_zone.gw }}"
+        gateway: "{{ network_mixer_zone.gateway }}"
         dns: "{{ network_mixer_zone.dns }}"
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml
index c6556f7b..d326cfe1 100644
--- a/inventory/group_vars/elevate-festival/main.yml
+++ b/inventory/group_vars/elevate-festival/main.yml
@@ -3,7 +3,7 @@ network_zones:
   lan:
     vlan: 18
     prefix: 192.168.18.0/24
-    gw: 192.168.18.254
+    gateway: 192.168.18.254
     dns:
       - 192.168.18.254
     dhcp:
@@ -24,7 +24,7 @@ network_zones:
   guest:
     vlan: 23
     prefix: 192.168.23.0/24
-    gw: 192.168.23.254
+    gateway: 192.168.23.254
     dns:
       - 192.168.23.254
     dhcp:
@@ -91,14 +91,14 @@ network_zones:
       x32core: 216
       datacop: 249
       equinox-t450s: 250
-    gw: 192.168.48.254
+    gateway: 192.168.48.254
     dns:
       - 192.168.48.254
 
   infoscreens:
     vlan: 73
     prefix: 192.168.73.0/24
-    gw: 192.168.73.254
+    gateway: 192.168.73.254
     dns:
       - 192.168.73.254
     dhcp:
@@ -112,7 +112,7 @@ network_zones:
   ccinet:
     vlan: 128
     prefix: 85.237.2.96/28
-    gw: 85.237.2.97
+    gateway: 85.237.2.97
     dns:
       - 217.29.144.65
       - 217.29.144.66
@@ -124,7 +124,7 @@ network_zones:
   ccemc:
     vlan: 129
     prefix: 85.237.28.192/28
-    gw: 85.237.28.193
+    gateway: 85.237.28.193
     dns:
       - 217.29.144.65
       - 217.29.144.66
diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/inventory/group_vars/r3-cccamp19/network.yml
index f2d84334..82216ea6 100644
--- a/inventory/group_vars/r3-cccamp19/network.yml
+++ b/inventory/group_vars/r3-cccamp19/network.yml
@@ -6,7 +6,7 @@ network_zones:
   lan:
     vlan: 126
     prefix: 192.168.126.0/24
-    gw: 192.168.126.254
+    gateway: 192.168.126.254
     dns:
       - 192.168.126.254
     dhcp:
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index 2316d647..e4acf4da 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -9,9 +9,9 @@ vm_host:
         interfaces:
           - eth0
         prefix: 89.106.215.29/28
-        gw: 89.106.215.30
+        gateway: 89.106.215.30
         prefix6: 2a02:3e0:407::29/64
-        gw6: 2a02:3e0:407::1
+        gateway6: 2a02:3e0:407::1
         offsets:
           ch-keyserver: 3
           ch-testvm: 4
diff --git a/inventory/host_vars/ch-gw-lan.yml b/inventory/host_vars/ch-gw-lan.yml
index 8e157d5f..3caee723 100644
--- a/inventory/host_vars/ch-gw-lan.yml
+++ b/inventory/host_vars/ch-gw-lan.yml
@@ -29,4 +29,4 @@ network:
     interface: svc0
     ip: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.svc.gw }}"
+    gateway: "{{ network_zones.svc.gateway }}"
diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml
index c926fd6d..eacd13b0 100644
--- a/inventory/host_vars/ch-jump.yml
+++ b/inventory/host_vars/ch-jump.yml
@@ -29,4 +29,4 @@ network:
     interface: svc0
     ip: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.svc.gw }}"
+    gateway: "{{ network_zones.svc.gateway }}"
diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
index cc714392..397d526f 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -29,6 +29,6 @@ network:
     interface: primary0
     ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gw }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway }}"
     prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gw6 }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index a4d8c2c7..19622983 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -283,7 +283,7 @@ openwrt_uci:
         proto: static
         ipaddr: "{{ network_zones.magenta.prefix | ipaddr(network_zones.magenta.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.magenta.prefix | ipaddr('netmask') }}"
-        gateway: "{{ network_zones.magenta.gw }}"
+        gateway: "{{ network_zones.magenta.gateway }}"
         dns: "{{ network_zones.magenta.dns }}"
 
     - name: interface 'mgmt'
diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm.yml
index 93032981..992dde45 100644
--- a/inventory/host_vars/ch-testvm.yml
+++ b/inventory/host_vars/ch-testvm.yml
@@ -29,6 +29,6 @@ network:
     interface: primary0
     ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gw }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway }}"
     prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gw6 }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index 77a02425..6afa87f9 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -10,7 +10,7 @@ network:
     interface: eno1
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 network_setup: elevate-festival
 
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index ca889d82..a2b66d85 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -26,7 +26,7 @@ openwrt_network_external:
       proto: static
       ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
       netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}"
-      gateway: "{{ network_wan_zone.gw }}"
+      gateway: "{{ network_wan_zone.gateway }}"
       dns: "{{ network_wan_zone.dns }}"
       accept_ra: 0
 
@@ -43,7 +43,7 @@ openwrt_network_internal_yaml: |
     options:
       ifname: "eth0.{{ network_zones[zone_name].vlan }}"
       proto: static
-      ipaddr: "{{ network_zones[zone_name].gw }}"
+      ipaddr: "{{ network_zones[zone_name].gateway }}"
       netmask: "{{ network_zones[zone_name].prefix | ipaddr('netmask') }}"
       accept_ra: 0
   {% endfor %}
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index dfa76949..b439ea52 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -10,7 +10,7 @@ network:
     interface: eno1
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 admin_user_host:
 - "{{ equinox_user }}"
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 533e2f04..5740b206 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -13,7 +13,7 @@ network:
     interface: eno1
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 admin_user_host:
 - "{{ equinox_user }}"
diff --git a/inventory/host_vars/ele-uhrturm.yml b/inventory/host_vars/ele-uhrturm.yml
index fadc90b4..342f7077 100644
--- a/inventory/host_vars/ele-uhrturm.yml
+++ b/inventory/host_vars/ele-uhrturm.yml
@@ -10,7 +10,7 @@ network:
     interface: eno1
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 ssh_keys_root: "{{ ssh_keys.equinox[env_group] + ssh_keys.datacop }}"
 
diff --git a/inventory/host_vars/r3-cccamp19-av.yml b/inventory/host_vars/r3-cccamp19-av.yml
index b751485a..378f459c 100644
--- a/inventory/host_vars/r3-cccamp19-av.yml
+++ b/inventory/host_vars/r3-cccamp19-av.yml
@@ -29,7 +29,7 @@ network:
     interface: lan0
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 dyndns:
   server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-feedcode.yml b/inventory/host_vars/r3-cccamp19-feedcode.yml
index 24aefcbe..87d6afc4 100644
--- a/inventory/host_vars/r3-cccamp19-feedcode.yml
+++ b/inventory/host_vars/r3-cccamp19-feedcode.yml
@@ -29,4 +29,4 @@ network:
     interface: lan0
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
diff --git a/inventory/host_vars/r3-cccamp19-flora.yml b/inventory/host_vars/r3-cccamp19-flora.yml
index b751485a..378f459c 100644
--- a/inventory/host_vars/r3-cccamp19-flora.yml
+++ b/inventory/host_vars/r3-cccamp19-flora.yml
@@ -29,7 +29,7 @@ network:
     interface: lan0
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 dyndns:
   server: ch-pan
diff --git a/inventory/host_vars/r3-cccamp19-verr.yml b/inventory/host_vars/r3-cccamp19-verr.yml
index decedd6e..03b32e4c 100644
--- a/inventory/host_vars/r3-cccamp19-verr.yml
+++ b/inventory/host_vars/r3-cccamp19-verr.yml
@@ -29,7 +29,7 @@ network:
     interface: lan0
     ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
-    gateway: "{{ network_zones.lan.gw }}"
+    gateway: "{{ network_zones.lan.gateway }}"
 
 dyndns:
   server: ch-pan
diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index ce2c1453..a8ea4810 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -29,6 +29,6 @@ network:
     interface: primary0
     ip: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address') }}"
     mask: "{{ hostvars[vm_host].vm_host.network.prefix | ipaddr('netmask') }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gw }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.gateway }}"
     prefix6: "{{ hostvars[vm_host].vm_host.network.prefix6 | ipaddr(hostvars[vm_host].vm_host.network.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway6: "{{ hostvars[vm_host].vm_host.network.gw6 }}"
+    gateway6: "{{ hostvars[vm_host].vm_host.network.gateway6 }}"
diff --git a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2
index 350753f6..3c2bbb78 100644
--- a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2
+++ b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2
@@ -10,7 +10,7 @@ network:
       id: {{ network_zones.ccinet.vlan }}
       link: {{ network.primary.interface }}
       addresses: [ {{ network_zones.ccinet.prefix | ipaddr(network_zones.ccinet.offsets[inventory_hostname]) | ipaddr('address/prefix') }} ]
-      gateway4: {{ network_zones.ccinet.gw }}
+      gateway4: {{ network_zones.ccinet.gateway }}
       accept-ra: false
       nameservers:
         search: [ {{ network.domain }} ]
diff --git a/roles/vm/host/tasks/network.yml b/roles/vm/host/tasks/network.yml
index db6bf82d..3f2cdf5c 100644
--- a/roles/vm/host/tasks/network.yml
+++ b/roles/vm/host/tasks/network.yml
@@ -14,8 +14,8 @@
           iface br-{{ item.key }} inet static
             address {{ item.value.prefix | ipaddr('address') }}
             netmask {{ item.value.prefix | ipaddr('netmask') }}
-          {%   if 'gw' in item.value %}
-            gateway {{ item.value.gw }}
+          {%   if 'gateway' in item.value %}
+            gateway {{ item.value.gateway }}
           {%   endif %}
           {% else %}
           iface br-{{ item.key }} inet manual
@@ -55,8 +55,8 @@
 
           iface br-{{ item.key }} inet6 static
             address {{ item.value.prefix6 }}
-          {%   if 'gw6' in item.value %}
-            gateway {{ item.value.gw6 }}
+          {%   if 'gateway6' in item.value %}
+            gateway {{ item.value.gateway6 }}
           {%   endif %}
           {% endif %}
       register: vmhost_bridge_config