Move bird include location

roles/internal/ffdo.bird/tasks/main.yml

@@ -1,20 +1,18 @@
 ---
 # tasks file for ffdo.bird
 
-- name: Ensure bird include dirs exists
-  file:
-    dest: /etc/{{item}}
-    state: directory
-  with_items:
-  - bird.d
-  - bird6.d
-
 - name: Ensure bird routing daemon is installed
   apt: name=bird state=present
 
-- name: Create bird config dir 
+- name: Ensure bird config dir exists
   file: name={{bird_config_dir}} state=directory
 
+- name: Ensure bird include dirs exists
+  file: name={{bird_config_dir}}/{{item}} state=directory
+  with_items:
+    - conf.d
+    - conf6.d
+
 - name: Install bird.conf
   template: src=bird.conf.j2 dest={{bird_config_dir}}/bird.conf
   notify: Restart bird daemons

roles/internal/ffdo.bird/templates/bird.conf.j2

@@ -20,4 +20,4 @@ protocol device {
         scan time 8;
 };
 
-include "/etc/bird.d/*.cfg";
+include "{{bird_config_dir}}/conf.d/*.conf";

roles/internal/ffdo.bird/templates/bird6.conf.j2

@@ -27,5 +27,4 @@ protocol device {
         scan time 10;
 }
 
-
-include "/etc/bird6.d/*.cfg";
+include "{{bird_config_dir}}/conf6.d/*.conf";

roles/internal/ffdo.mesh-interfaces/tasks/main.yml

@@ -6,11 +6,11 @@
     dest: /etc/test-hosts.info
 
 - name: Install bird.conf
-  template: src=bird.conf.j2 dest=/etc/bird.d/mesh.conf
+  template: src=bird.conf.j2 dest=/etc/bird/conf.d/mesh.conf
   notify: Restart bird daemons
 
 - name: Install bird6.conf
-  template: src=bird6.conf.j2 dest=/etc/bird6.d/mesh.conf
+  template: src=bird6.conf.j2 dest=/etc/bird/conf6.d/mesh.conf
   notify: Restart bird daemons
 
 - name: Ensure interface definitions from other files are included

roles/internal/ffdo.peering/tasks/main.yml

@@ -23,9 +23,9 @@
     template: peering_interfaces.j2
 
 - name: Install bird.conf
-  template: src=bird.conf.j2 dest=/etc/bird.d/peering.conf
+  template: src=bird.conf.j2 dest=/etc/bird/conf.d/peering.conf
   notify: Restart bird daemons
 
 - name: Install bird6.conf
-  template: src=bird6.conf.j2 dest=/etc/bird6.d/peering6.conf
+  template: src=bird6.conf.j2 dest=/etc/bird/conf6.d/peering6.conf
   notify: Restart bird daemons