瀏覽代碼

Fixed some platform specific issues in bird role

Till Klocke 9 年之前
父節點
當前提交
4d0bbaece8

+ 1 - 2
roles/bird/defaults/main.yml

@@ -1,3 +1,2 @@
 ---
-# defaults file for bird
-bird_config_dir: /etc/bird
+# defaults file for bird

+ 6 - 0
roles/bird/handlers/main.yml

@@ -1,2 +1,8 @@
 ---
 # handlers file for bird
+
+- name: Restart bird daemons
+  service: name={{item}} state=restarted
+  with_items:
+  - bird
+  - bird6

+ 4 - 0
roles/bird/tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 # tasks file for bird
 
+- include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+
 - include: debian.yml
   when: ansible_distribution == "Debian"
 
@@ -12,9 +14,11 @@
 
 - name: Install bird.conf
   template: src=bird.conf.j2 dest={{bird_config_dir}}/bird.conf
+  notify: Restart bird daemons
 
 - name: Install bird6.conf
   template: src=bird6.conf.j2 dest={{bird_config_dir}}/bird6.conf
+  notify: Restart bird daemons
 
 - name: Enable and start bird and bird6
   service: name={{item}} state=started enabled=yes

+ 1 - 0
roles/bird/vars/Debian-jessie.yml

@@ -0,0 +1 @@
+bird_config_dir: /etc/bird

+ 1 - 0
roles/bird/vars/Debian-wheezy.yml

@@ -0,0 +1 @@
+bird_config_dir: /etc

+ 1 - 0
roles/bird/vars/Ubuntu-trusty.yml

@@ -0,0 +1 @@
+bird_config_dir: /etc/bird