Browse Source

Groups states for infra services in one stanza

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 1 year ago
parent
commit
d7f89f6be1
1 changed files with 7 additions and 12 deletions
  1. 7 12
      top.sls

+ 7 - 12
top.sls

@@ -103,18 +103,6 @@ base:
     - match: pillar
     - dns-server
 
-  # DNS recursor
-  nodes:{{ grains['id'] }}:roles:dns-recursor:
-    - match: pillar
-    - dns-server
-    - anycast-healthchecker
-
-  # LDAP replicas
-  nodes:{{ grains['id'] }}:roles:ldap-replica:
-    - match: pillar
-    - slapd
-    - anycast-healthchecker
-
   # Webfrontend
   nodes:{{ grains['id'] }}:roles:frontend:
     - match: pillar
@@ -149,3 +137,10 @@ base:
   nodes:{{ grains['id'] }}:roles:librenms:
     - match: pillar
     - librenms
+
+  # Anycasted infrastructure services
+  nodes:{{ grains['id'] }}:role:infra-services:
+    - match: pillar
+    - anycast-healthchecker
+    - dns-server
+    - slapd