浏览代码

bird: Make sure birdc{,6} is called after L3 access config is written.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 6 年之前
父节点
当前提交
60d8a9ec93
共有 1 个文件被更改,包括 12 次插入0 次删除
  1. 12 0
      bird/init.sls

+ 12 - 0
bird/init.sls

@@ -341,11 +341,23 @@ bird6-configure:
   file.managed:
     - source: salt://bird/l3-access.conf
     - template: jinja
+    - watch_in:
+      - cmd: bird-configure
+    - require:
+      - file: /etc/bird/bird.d
+    - require_in:
+      - service: bird
 
 /etc/bird/bird6.d/l3-access.conf:
   file.managed:
     - source: salt://bird/l3-access.conf
     - template: jinja
+    - watch_in:
+      - cmd: bird6-configure
+    - require:
+      - file: /etc/bird/bird6.d
+    - require_in:
+      - service: bird6
 
 {% else %}
 /etc/bird/bird.d/l3-access.conf: