]> Frank Brehm's Git Trees - salt/pillar.git/commitdiff
Adding liz.nexunus.net to pillars
authorFrank Brehm <frank@brehm-online.com>
Sun, 27 Mar 2016 08:18:41 +0000 (10:18 +0200)
committerFrank Brehm <frank@brehm-online.com>
Sun, 27 Mar 2016 08:18:41 +0000 (10:18 +0200)
common.sls
top.sls

index ca75c478f6156bb4c9b8eda71d3d89aa9572643f..fd7f741072a505590ad086f2a0bd8ac13752373b 100644 (file)
@@ -1,14 +1,16 @@
 logrotate:
-{% if salt['grains.get']('fqdn') == 'ns3.uhu-banane.de' %}
+{%- if salt['grains.get']('fqdn') == 'ns3.uhu-banane.de' %}
   verbose: True
-{% else %}
+{%- else %}
   verbose: False
-{% endif %}
+{%- endif %}
 
 networking:
-{% if salt['grains.get']('fqdn') == 'ns3.uhu-banane.de' %}
+{%- if salt['grains.get']('fqdn') == 'ns3.uhu-banane.de' %}
   has_public_ipv6: True
-{% else %}
+{%- elif salt['grains.get']('fqdn') in ('liz.nexunus.net', ) %}
+  has_public_ipv6: True
+{%- else %}
   has_public_ipv6: False
-{% endif %}
+{%- endif %}
 
diff --git a/top.sls b/top.sls
index 5ec22f2c36f752b0b6c6fc9f3b15a667544cdfeb..dc4a5647a8c629c672217a2324b0422fe7e00e64 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -25,3 +25,7 @@ base:
     - bind.common
     - bind.primary
 
+  'liz.nexunus.net':
+    - common
+    - resolver.nexunus
+