浏览代码

Updated test ansible vars so the test playbook works again

Till Klocke 9 年之前
父节点
当前提交
1b38aa1e53
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      test/application/supernode_pkg_vars.yml

+ 7 - 1
test/application/supernode_pkg_vars.yml

@@ -7,6 +7,9 @@ supernodes:
     bat_mac: f2:43:13:c0:d7:06
     dhcp_range_start: 10.42.0.32
     dhcp_range_end: 10.42.5.254
+    public_interface: eth1
+    uplink_tunnel_ip: 172.16.42.2/30
+    uplink_tunnel_ip_v6: fd30:db1d:2377:4143::2/64
   - name: node02
     public_ip: 192.168.77.22
     mesh_ip_v4: 10.42.0.16/16
@@ -15,6 +18,7 @@ supernodes:
     bat_mac: 1e:f5:dc:71:bb:5f
     dhcp_range_start: 10.42.6.2
     dhcp_range_end: 10.42.8.254
+    public_interface: eth1
 
 supernode_mesh_mac: 96:48:76:b5:a3:61
 supernode_mesh_ipv4: 10.42.0.1/16
@@ -22,6 +26,7 @@ supernode_as: '65403'
 supernode_bat_macaddress: f2:43:13:c0:d7:06
 supernode_mesh_ipv6: 2a03:2260:50:5::8/64
 supernode_local_ip: "{{ansible_default_ipv4.address}}"
+supernode_public_interface: "{{ansible_default_ipv4.interface}}"
 supernode_other_nameserver: 10.42.0.23
 supernode_other_ntp_server: 10.42.0.23
 supernode_dhcp_range_start: 10.42.9.1
@@ -33,6 +38,8 @@ supernode_mesh_backbones:
     remote_ip: "{{supernodes[1].public_ip}}"
     mesh_ip: "{{supernodes[1].mesh_ip_v4|ipaddr('address')}}"
     address_v6: "{{supernodes[1].mesh_ip_v6|ipaddr('address')}}"
+    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
+    interface: "{{supernode_public_interface}}"
 
 supernode_uplinks:
   - name: uplink1
@@ -42,7 +49,6 @@ supernode_uplinks:
     netmask: 255.255.255.252
     endpoint: 192.168.0.23
     address_v6: fd0a:1c06:d97c:e88d::2/64
-    #adress_v6_pure: fd0a:1c06:d97c:e88d::2
     as: '65079'
 
 fastd_instances: