tnet: Using templates instead of files

20 files changed, 6 insertions, 15 deletions

diff --git a/tnet/bird-deploy.yml b/tnet/bird-deploy.yml
index ed7cecf..82f7f39 100644
--- a/tnet/bird-deploy.yml
+++ b/tnet/bird-deploy.yml
@@ -1,9 +1,9 @@
 - hosts: tnet_bird
   tasks:
     - become: yes
-      copy:
-        dest: "/etc/bird/{{ item }}"
+      template:
         src: "{{ inventory_hostname }}/{{ item }}"
+        dest: "/etc/bird/{{ item }}"
         owner: bird
         group: bird
         mode: 0640
diff --git a/tnet/bird-gen.yml b/tnet/bird-gen.yml
index 9fa71b1..74a83b1 100644
--- a/tnet/bird-gen.yml
+++ b/tnet/bird-gen.yml
@@ -1,25 +1,16 @@
-- name: Remove old configuration
-  hosts: localhost
-  connection: local
-  gather_facts: False
-  tasks:
-    - file:
-        path: files
-        state: absent
-      changed_when: False
-
 - name: Generate Bird configuration
   hosts: tnet_bird
   connection: local
   gather_facts: False
   tasks:
-    - file:
+    - name: rmdir files/$hostname
+      file:
         path: files/{{ inventory_hostname }}
-        state: directory
+        state: absent
       changed_when: False
     - template:
         src: "{{ item }}.j2"
-        dest: "files/{{ inventory_hostname }}/{{ item }}"
+        dest: "templates/{{ inventory_hostname }}/{{ item }}"
       loop:
         - bird-tnet-pre.conf
         - bird-tnet.conf
diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/templates/akili/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/akili/bird-tnet-pre.conf
+++ b/tnet/templates/akili/bird-tnet-pre.conf
diff --git a/tnet/files/akili/bird-tnet.conf b/tnet/templates/akili/bird-tnet.conf
index 24c9b8e..24c9b8e 100644
--- a/tnet/files/akili/bird-tnet.conf
+++ b/tnet/templates/akili/bird-tnet.conf
diff --git a/tnet/files/astyanax/bird-tnet-pre.conf b/tnet/templates/astyanax/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/astyanax/bird-tnet-pre.conf
+++ b/tnet/templates/astyanax/bird-tnet-pre.conf
diff --git a/tnet/files/astyanax/bird-tnet.conf b/tnet/templates/astyanax/bird-tnet.conf
index 3dbf4c9..3dbf4c9 100644
--- a/tnet/files/astyanax/bird-tnet.conf
+++ b/tnet/templates/astyanax/bird-tnet.conf
diff --git a/tnet/files/conflatorio/bird-tnet-pre.conf b/tnet/templates/conflatorio/bird-tnet-pre.conf
index d60e8df..d60e8df 100644
--- a/tnet/files/conflatorio/bird-tnet-pre.conf
+++ b/tnet/templates/conflatorio/bird-tnet-pre.conf
diff --git a/tnet/files/conflatorio/bird-tnet.conf b/tnet/templates/conflatorio/bird-tnet.conf
index 02780a6..02780a6 100644
--- a/tnet/files/conflatorio/bird-tnet.conf
+++ b/tnet/templates/conflatorio/bird-tnet.conf
diff --git a/tnet/files/coregonus/bird-tnet-pre.conf b/tnet/templates/coregonus/bird-tnet-pre.conf
index d60e8df..d60e8df 100644
--- a/tnet/files/coregonus/bird-tnet-pre.conf
+++ b/tnet/templates/coregonus/bird-tnet-pre.conf
diff --git a/tnet/files/coregonus/bird-tnet.conf b/tnet/templates/coregonus/bird-tnet.conf
index 95ede41..95ede41 100644
--- a/tnet/files/coregonus/bird-tnet.conf
+++ b/tnet/templates/coregonus/bird-tnet.conf
diff --git a/tnet/files/hash/bird-tnet-pre.conf b/tnet/templates/hash/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/hash/bird-tnet-pre.conf
+++ b/tnet/templates/hash/bird-tnet-pre.conf
diff --git a/tnet/files/hash/bird-tnet.conf b/tnet/templates/hash/bird-tnet.conf
index a570291..a570291 100644
--- a/tnet/files/hash/bird-tnet.conf
+++ b/tnet/templates/hash/bird-tnet.conf
diff --git a/tnet/files/knot/bird-tnet-pre.conf b/tnet/templates/knot/bird-tnet-pre.conf
index d60e8df..d60e8df 100644
--- a/tnet/files/knot/bird-tnet-pre.conf
+++ b/tnet/templates/knot/bird-tnet-pre.conf
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/templates/knot/bird-tnet.conf
index f21be09..f21be09 100644
--- a/tnet/files/knot/bird-tnet.conf
+++ b/tnet/templates/knot/bird-tnet.conf
diff --git a/tnet/files/lhn2pi/bird-tnet-pre.conf b/tnet/templates/lhn2pi/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/lhn2pi/bird-tnet-pre.conf
+++ b/tnet/templates/lhn2pi/bird-tnet-pre.conf
diff --git a/tnet/files/lhn2pi/bird-tnet.conf b/tnet/templates/lhn2pi/bird-tnet.conf
index 9f0ef8c..9f0ef8c 100644
--- a/tnet/files/lhn2pi/bird-tnet.conf
+++ b/tnet/templates/lhn2pi/bird-tnet.conf
diff --git a/tnet/files/node1/bird-tnet-pre.conf b/tnet/templates/node1/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/node1/bird-tnet-pre.conf
+++ b/tnet/templates/node1/bird-tnet-pre.conf
diff --git a/tnet/files/node1/bird-tnet.conf b/tnet/templates/node1/bird-tnet.conf
index 6449582..6449582 100644
--- a/tnet/files/node1/bird-tnet.conf
+++ b/tnet/templates/node1/bird-tnet.conf
diff --git a/tnet/files/node2/bird-tnet-pre.conf b/tnet/templates/node2/bird-tnet-pre.conf
index 74c981d..74c981d 100644
--- a/tnet/files/node2/bird-tnet-pre.conf
+++ b/tnet/templates/node2/bird-tnet-pre.conf
diff --git a/tnet/files/node2/bird-tnet.conf b/tnet/templates/node2/bird-tnet.conf
index b9a2294..b9a2294 100644
--- a/tnet/files/node2/bird-tnet.conf
+++ b/tnet/templates/node2/bird-tnet.conf