gw vs. gateway

16 files changed, 21 insertions, 21 deletions

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 }}"