From 77544208978e6a76a280ac7ed2352226415e35bd Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Nov 10 2017 13:08:38 +0000
Subject: Merge branch 'tampakrap_empty_files_remove' into 'production'


Introduce include_optional and remove empty / unused roles

See merge request infra/salt!77
---

diff --git a/pillar/macros.jinja b/pillar/macros.jinja
new file mode 100644
index 0000000..3a7579c
--- /dev/null
+++ b/pillar/macros.jinja
@@ -0,0 +1,7 @@
+{%- macro include_optional(sls_file) %}
+  {%- for root in opts['pillar_roots'][saltenv] -%}
+    {%- if salt['file.file_exists']('{0}/{1}/init.sls'.format(root, sls_file))  %}
+    - {{ sls_file }}
+    {% endif %}
+  {%- endfor %}
+{%- endmacro %}
diff --git a/pillar/role/jenkins.sls b/pillar/role/jenkins.sls
deleted file mode 100644
index f1cb146..0000000
--- a/pillar/role/jenkins.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-limits:
-  users:
-    '*':
-      - limit_type: hard
-        limit_item: nofile
-        limit_value: 8192
-      - limit_type: soft
-        limit_item: nofile
-        limit_value: 8192
diff --git a/pillar/role/ns.sls b/pillar/role/ns.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/role/ns.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/role/obs.sls b/pillar/role/obs.sls
deleted file mode 100644
index 237d227..0000000
--- a/pillar/role/obs.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-sudoers:
-  included_files:
-    /etc/sudoers.d/nagios_nopasswd_sign:
-      users:
-        nagios:
-          - 'ALL=(ALL) NOPASSWD: /usr/bin/sign -t'
diff --git a/pillar/role/openvpn.sls b/pillar/role/openvpn.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/role/openvpn.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/role/worker_gitlab.sls b/pillar/role/worker_gitlab.sls
deleted file mode 100644
index 792d600..0000000
--- a/pillar/role/worker_gitlab.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/pillar/top.sls b/pillar/top.sls
index 3b5834a..3372223 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -1,3 +1,4 @@
+{% from "macros.jinja" import include_optional with context %}
 {% set country = salt['grains.get']('country') %}
 {% set domain = salt['grains.get']('domain') %}
 {% set id = salt['grains.get']('id') %}
@@ -14,7 +15,7 @@ production:
   {% for role in roles %}
   'roles:{{ role }}':
     - match: grain
-    - role.{{ role }}
+    {{ include_optional("role/{0}".format(role)) }}
   {% endfor %}
   {% if virt_cluster and virt_cluster == 'atreju' and virtual == 'kvm' %}
   'virt_cluster:{{ virt_cluster }}':
diff --git a/salt/macros.jinja b/salt/macros.jinja
new file mode 100644
index 0000000..64e566b
--- /dev/null
+++ b/salt/macros.jinja
@@ -0,0 +1,7 @@
+{%- macro include_optional(sls_file) %}
+  {%- for root in opts['file_roots'][saltenv] -%}
+    {%- if salt['file.file_exists']('{0}/{1}/init.sls'.format(root, sls_file))  %}
+    - {{ sls_file }}
+    {% endif %}
+  {%- endfor %}
+{%- endmacro %}
diff --git a/salt/role/jenkins.sls b/salt/role/jenkins.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/jenkins.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/lists.sls b/salt/role/lists.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/lists.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/login.sls b/salt/role/login.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/login.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/ns.sls b/salt/role/ns.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/ns.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/ntp.sls b/salt/role/ntp.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/ntp.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/obs.sls b/salt/role/obs.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/obs.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/openvpn.sls b/salt/role/openvpn.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/openvpn.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/proxy_master.sls b/salt/role/proxy_master.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/proxy_master.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/proxy_slave.sls b/salt/role/proxy_slave.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/proxy_slave.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/wiki_readonly.sls b/salt/role/wiki_readonly.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/wiki_readonly.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/role/worker_gitlab.sls b/salt/role/worker_gitlab.sls
deleted file mode 100644
index 792d600..0000000
--- a/salt/role/worker_gitlab.sls
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/salt/top.sls b/salt/top.sls
index d40f1ba..d8d0d69 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -1,3 +1,4 @@
+{% from "macros.jinja" import include_optional with context %}
 {% set roles = salt['pillar.get']('grains:roles', []) %}
 
 production:
@@ -6,5 +7,5 @@ production:
   {% for role in roles %}
   'roles:{{ role }}':
     - match: grain
-    - role.{{ role }}
+    {{ include_optional("role/{0}".format(role)) }}
   {% endfor %}