Enable dhcpd and radvd

roles/service-dhcp/tasks/main.yml

@@ -1,15 +1,15 @@
 ---
-# tasks file for ffdo-dhcp
 
 - name: Ensure ISC DHCPD is installed
-  apt: name=isc-dhcp-server state=present update_cache=yes cache_valid_time=3600
+  apt: name=isc-dhcp-server
+
+- name: Bind dhcpd to bat0
+  lineinfile: dest=/etc/default/isc-dhcp-server regexp="^INTERFACES" line='INTERFACES="bat0"'
+  notify: "Restart dhcpd"
 
 - name: Install dhcpd.conf
-  template:
-    src: dhcpd.conf.j2
-    dest: /etc/dhcp/dhcpd.conf
-  notify:
-  - Restart dhcpd
+  template: src=dhcpd.conf.j2 dest=/etc/dhcp/dhcpd.conf
+  notify: "Restart dhcpd"
 
 - name: Ensure dhcpd is started and enabled
-  service: name=isc-dhcp-server state=started enabled=yes
+  service: name=isc-dhcp-server state=started enabled=yes

roles/service-dhcp/templates/dhcpd.conf.j2

@@ -21,4 +21,4 @@ subnet {{mesh_ipv4|ipaddr('network')}} netmask {{mesh_ipv4|ipaddr('netmask')}} {
   option routers {{mesh_ipv4|ipaddr('address')}};
   option domain-name-servers {{mesh_ipv4|ipaddr('address')}};
   option ntp-servers {{mesh_ipv4|ipaddr('address')}};
-}
+}

roles/service-ra/tasks/main.yml

@@ -0,0 +1,11 @@
+---
+
+- 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

roles/service-ra/tasks/radvd.yml

@@ -1,15 +0,0 @@
----
-# tasks file for ffdo.radvd
-
-- name: Ensure radvd is installed
-  apt: name=radvd state=present update_cache=yes cache_valid_time=3600
-
-- 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

roles/service-ra/templates/radvd.conf.j2

@@ -1,4 +1,3 @@
-{% if mesh_ipv6 is defined %}
 interface bat0
 {
     AdvSendAdvert on;
@@ -14,4 +13,3 @@ interface bat0
     {
     };
 };
-{% endif %}

site.yml

@@ -16,8 +16,8 @@
 #     - gateway-nat
     - service-dns
     - service-ntp
-#     - service-ra
-#     - service-dhcp
+    - service-ra
+    - service-dhcp
 
 # - hosts: mapservers
 #   roles: