Browse Source

fastd: Merge fastd.peers state into main state and add dependencies.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 3 years ago
parent
commit
b850512330
2 changed files with 28 additions and 26 deletions
  1. 28 8
      fastd/init.sls
  2. 0 18
      fastd/peers.sls

+ 28 - 8
fastd/init.sls

@@ -2,19 +2,14 @@
 # Fastd for gateways
 #
 
+include:
+  - network.interfaces
+
 {% set sites_all = pillar.get ('sites') %}
 {% set node_config = salt['pillar.get']('nodes:' ~ grains.id, {}) %}
 {% set sites_node = node_config.get('sites', {}) %}
 {% set device_no = node_config.get('id', -1) %}
 
-include:
-  - apt
-  - network.interfaces
-{% if 'fastd_peers' in node_config.get('roles', []) %}
-  - fastd.peers
-{% endif %}
-
-
 
 # Install fastd
 fastd:
@@ -38,6 +33,31 @@ fastd:
   require:
     - pkg: fastd
 
+
+#
+# Is this instance to be used by external clients?
+{% if 'fastd_peers' in node_config.get ('roles', []) %}
+# publish blacklist
+/etc/fastd/peers-blacklist:
+  file.managed:
+    - source: salt://fastd/peers-blacklist
+    - user: root
+    - group: root
+    - mode: 644
+    - require:
+      - file: /etc/fastd
+
+/etc/fastd/verify-peer.sh:
+  file.managed:
+    - source: salt://fastd/verify-peer.sh
+    - user: root
+    - group: root
+    - mode: 744
+    - require:
+      - file: /etc/fastd
+{% endif %}
+
+
 #
 # Set up fastd configuration for every network (nodes4, nodes6, intergw-vpn)
 # for every site associated for the current minion ID.

+ 0 - 18
fastd/peers.sls

@@ -1,18 +0,0 @@
-#
-# FFHO Gateways specific stuff
-#
-
-# publish blacklist
-/etc/fastd/peers-blacklist:
-  file.managed:
-    - source: salt://fastd/peers-blacklist
-    - user: root
-    - group: root
-    - mode: 644
-
-/etc/fastd/verify-peer.sh:
-  file.managed:
-    - source: salt://fastd/verify-peer.sh
-    - user: root
-    - group: root
-    - mode: 744