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

Use Bird instead of radvd for router advertisement

Markus Lindenberg преди 9 години
родител
ревизия
e231cbcfc7
променени са 5 файла, в които са добавени 11 реда и са изтрити 33 реда
  1. 11 1
      roles/mesh-batman/templates/batman6.conf.j2
  2. 0 5
      roles/service-ra/handlers/main.yml
  3. 0 11
      roles/service-ra/tasks/main.yml
  4. 0 15
      roles/service-ra/templates/radvd.conf.j2
  5. 0 1
      site.yml

+ 11 - 1
roles/mesh-batman/templates/batman6.conf.j2

@@ -1,3 +1,13 @@
-protocol direct	direct_bat0 {
+protocol direct direct_bat0 {
 	interface "bat0";
 }
+
+protocol radv radv_bat0 {
+	interface "bat0";
+	rdnss {{mesh_ipv6_address|ipaddr('address')}};
+{% for host in groups['supernodes'] %}
+{% if hostvars[host]['inventory_hostname'] != inventory_hostname %}
+	rdnss {{ hostvars[host]['mesh_ipv6_address']|ipaddr('address')}};
+{% endif %}
+{% endfor %}
+}

+ 0 - 5
roles/service-ra/handlers/main.yml

@@ -1,5 +0,0 @@
----
-# handlers file for ffdo.radvd
-
-- name: Restart radvd
-  service: name=radvd state=restarted

+ 0 - 11
roles/service-ra/tasks/main.yml

@@ -1,11 +0,0 @@
----
-
-- name: Ensure radvd is installed
-  apt: name=radvd
-
-- name: Install radvd config
-  template: src=radvd.conf.j2 dest=/etc/radvd.conf
-  notify: "Restart radvd"
-
-- name: Ensure radvd is started and enabled
-  service: name=radvd state=started enabled=yes

+ 0 - 15
roles/service-ra/templates/radvd.conf.j2

@@ -1,15 +0,0 @@
-interface bat0
-{
-    AdvSendAdvert on;
-    IgnoreIfMissing on;
-    MaxRtrAdvInterval 600;
-    MinDelayBetweenRAs 10;
-    AdvLinkMTU 1280;
-    prefix {{batman_mesh_ipv6}}
-    {
-    };
-
-    RDNSS {{batman_mesh_ipv6|ipaddr('address')}}
-    {
-    };
-};

+ 0 - 1
site.yml

@@ -20,7 +20,6 @@
     - mesh-vpn-fastd
     - service-dns
     - service-ntp
-    - service-ra
     - service-dhcp
 
 # - hosts: mapservers