Преглед на файлове

The interfaces template is now much more freifunk specific

Till Klocke преди 9 години
родител
ревизия
ca00ef027b
променени са 3 файла, в които са добавени 25 реда и са изтрити 4 реда
  1. 0 2
      roles/ff-supernode/templates/interfaces.j2
  2. 17 2
      test/application/supernode_pkg_vars.yml
  3. 8 0
      test/integration/supernode/serverspec/test_spec.rb

+ 0 - 2
roles/ff-supernode/templates/interfaces.j2

@@ -49,10 +49,8 @@ iface bat0 inet static
     pre-up batctl bl 0
     pre-up batctl gw server 48mbit/48mbit
     pre-up echo 120 > /sys/class/net/$IFACE/mesh/hop_penalty
-
     post-down ip rule del from {{supernode_mesh_net_cidr}} table 42
     post-down ip rule del to {{supernode_mesh_net_cidr}} table 42
-
     # Paralleles Macvlan-Interface mit fixer MTU fuer Alfred
     up ip link add link $IFACE alfred0 type macvlan
     up ip link set dev alfred0 mtu 1280

+ 17 - 2
test/application/supernode_pkg_vars.yml

@@ -1,10 +1,25 @@
-supernode_mesh_mac: C7:D9:55:60:1C:7B
+supernode_mesh_mac: 96:48:76:b5:a3:61
 supernode_mesh_ipv4: 10.42.0.1
 supernode_mesh_netmask_ipv4: 255.255.0.0
-supernode_bat_macaddress: 39:C5:49:BE:00:78
+supernode_bat_macaddress: f2:43:13:c0:d7:06
 supernode_mesh_net_cidr: 10.42.0.0/16
 supernode_mesh_ipv6: fdfe:7808:502a:4eb7::1/64
 supernode_mesh_net_ipv6: fdfe:7808:502a:4eb7::/64
+supernode_local_ip: "{{ansible_default_ipv4.address}}"
+
+supernode_mesh_backbones:
+  - name: test-node02
+    comment: Non existant mesh backbone
+    remote_ip: 192.168.0.43
+
+supernode_uplinks:
+  - name: ffanon-uplink1
+    comment: Non existant uplink
+    address: 172.16.0.1
+    dstaddr: 172.16.0.2
+    netmask: 255.255.255.252
+    endpoint: 192.168.0.23
+    address_v6: fd0a:1c06:d97c:e88d::2/64
 
 fastd_instances:
   - name: do00

+ 8 - 0
test/integration/supernode/serverspec/test_spec.rb

@@ -108,6 +108,14 @@ describe interface('tap01') do
   it { should exist }
 end
 
+describe interface('test-node02') do
+  it { should exist }
+end
+
+describe interface('ffanon-uplink1') do
+  it { should exist }
+end
+
 describe cron do
   it { should have_entry '*/5 * * * * wget -q -O /etc/fastd/fastd-blacklist.json https://raw.githubusercontent.com/ffruhr/fastdbl/master/fastd-blacklist.json' }
 end