diff --git a/tools/subnets.py b/tools/subnets.py index 1c36862..b5e2155 100644 --- a/tools/subnets.py +++ b/tools/subnets.py @@ -54,8 +54,8 @@ def hq(base): ("MGMT_ADDR", iface(n999, 2)), ("MGMT_GW", plain(n999, 1)), # туннель (сеть и концы по заданию) - ("GRE_LOCAL_HQ", str(GRE_HQ.ip)), - ("GRE_LOCAL_BR", str(GRE_BR.ip)), + ("GRE_LOCAL_HQ", str(GRE_HQ)), + ("GRE_LOCAL_BR", str(GRE_BR)), # DNS-записи таблицы 3 (ISP-линки фиксированы заданием) ("HQ_RTR_IP", plain(n100, 1)), ("ISP_TO_HQ_IP", "172.16.1.1"), diff --git a/zadanie1/br-rtr.sh b/zadanie1/br-rtr.sh index 9243b83..93b187b 100644 --- a/zadanie1/br-rtr.sh +++ b/zadanie1/br-rtr.sh @@ -141,7 +141,7 @@ autoconnect=yes interface-name=$GRE_IF [ip-tunnel] -mode=gre +mode=2 remote=$GRE_REMOTE [ipv4] diff --git a/zadanie1/hq-rtr.sh b/zadanie1/hq-rtr.sh index 45c3848..a05cb91 100644 --- a/zadanie1/hq-rtr.sh +++ b/zadanie1/hq-rtr.sh @@ -175,7 +175,7 @@ autoconnect=yes interface-name=$GRE_IF [ip-tunnel] -mode=gre +mode=2 remote=$GRE_REMOTE [ipv4]