From 10cbfe475df689a028d86f8489a2301952bfe6a7 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Nov 10 2017 12:07:52 +0000
Subject: apply the include_optional on role includes and remove the empty role files


---

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/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 39561e5..3372223 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -15,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/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/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 7452241..d8d0d69 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -7,5 +7,5 @@ production:
   {% for role in roles %}
   'roles:{{ role }}':
     - match: grain
-    - role.{{ role }}
+    {{ include_optional("role/{0}".format(role)) }}
   {% endfor %}