removed password.sls, which shouldn't exist yet

pillars/roles.jinja

@@ -0,0 +1 @@
+{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls").split('\n') -%}

pillars/roles/aurpkgs/init.sls

@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.aurpkgs.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'aurrepo' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.aurpkgs.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'aurrepo' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.aurpkgs.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.aurpkgs.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.aurpkgs.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.aurpkgs.'+role in states %}
   - roles.aurpkgs.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/backup/init.sls

@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.backup.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'backup' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.backup.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'backup' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.backup.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.backup.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.backup.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.backup.'+role in states %}
   - roles.backup.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/ca/init.sls

@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.ca.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'ca' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.ca.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'ca' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.ca.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.ca.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.ca.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.ca.'+role in states %}
   - roles.ca.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/database/init.sls

@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.database.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'mysql' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.database.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'mysql' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.database.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.database.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/firewalld/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.firewalld.core
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.firewalld.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.firewalld.'+role in states %}
   - roles.firewalld.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/git/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.git.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.git.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.git.'+role in states %}
   - roles.git.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/gitea/init.sls

@@ -1,13 +0,0 @@
-{% set states = salt['cp.list_states'](saltenv) %}
-include:
-  - roles.git.none
-
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.git.'+role in states %}
-  - roles.git.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
-{%- endif -%}

pillars/roles/gitea/portal.sls

@@ -1,25 +0,0 @@
-git:
-  tmux-root:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/root/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  tmux-ejparker:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
-    path: "/ejparker/tmux"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  web:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/portal.git"
-    path: "/srv/http/portal"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/gitea/saltmaster.sls

@@ -1,17 +0,0 @@
-git:
-  salt:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/prod"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-  salt_dev:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/dev"
-    branch: "dev"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/gitea/ytdownloader.sls

@@ -1,9 +0,0 @@
-git:
-  ytdownloader:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/ytdownloader.git"
-    path: "/root/scripts/ytdownloader"
-    branch: "master"
-    key: "git_actcur"
-    force: true
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"

pillars/roles/host/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.host.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.host.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.host.'+role in states %}
   - roles.host.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/laradev/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.laradev.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.laradev.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.laradev.'+role in states %}
   - roles.laradev.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/lxc/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.lxc.container_profiles
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.lxc.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.lxc.'+role in states %}
   - roles.lxc.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/mount/init.sls

@@ -1,13 +1,12 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.mount.none
 
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
-      {%- if 'pillars.roles.mount.'+role in states %}
+{%- if roles is not none -%}
+  {%- for role in roles %}
+    {%- if 'pillars.roles.mount.'+role in states %}
   - roles.mount.{{ role }}
-      {%- endif -%}
-    {%- endfor -%}
-  {%- endif -%}
+    {%- endif -%}
+  {%- endfor -%}
 {%- endif -%}

pillars/roles/nginx/init.sls

@@ -1,21 +1,20 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.nginx.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'portal' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.nginx.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'portal' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.nginx.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.nginx.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- else -%}
-      {%- for role in grains['roles'] %}
-        {%- if 'pillars.roles.nginx.'+role in states %}
+      {%- endif -%}
+    {%- endfor -%}
+  {%- else -%}
+    {%- for role in roles %}
+      {%- if 'pillars.roles.nginx.'+role in states %}
   - roles.nginx.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/router/init.sls

@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.router.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'router' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.router.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'router' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.router.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.router.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/roles/services/init.sls

@@ -1,15 +1,14 @@
+{%- from "roles.jinja" import roles with context %}
 {% set states = salt['cp.list_states'](saltenv) %}
 include:
   - roles.services.none
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- if 'icinga' in grains['roles'] -%}
-      {%- for state in states %}
-        {%- if state.startswith("pillars.roles.services.") -%}
-          {%- set role = state.split('.')[3] %}
+{%- if roles is not none -%}
+  {%- if 'icinga' in roles -%}
+    {%- for state in states %}
+      {%- if state.startswith("pillars.roles.services.") -%}
+        {%- set role = state.split('.')[3] %}
   - roles.services.{{ role }}
-        {%- endif -%}
-      {%- endfor -%}
-    {%- endif -%}
+      {%- endif -%}
+    {%- endfor -%}
   {%- endif -%}
 {%- endif -%}

pillars/servers/roles/server/archtest.sls

@@ -1,6 +1,5 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion

pillars/servers/roles/server/arr.sls

@@ -1,13 +1,12 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - arr
-    - sonarr
-    - radarr
-    - lidarr
-    - jackett
-    - ytdownloader
-    - podfox
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - arr
+  - sonarr
+  - radarr
+  - lidarr
+  - jackett
+  - ytdownloader
+  - podfox

pillars/servers/roles/server/atheos.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - atheos
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - atheos
+  - nginx-proxy

pillars/servers/roles/server/authelia.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - authelia
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - authelia
+  - nginx-proxy

pillars/servers/roles/server/baikal.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - baikal
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - baikal

pillars/servers/roles/server/base

@@ -1,6 +1,5 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion

pillars/servers/roles/server/bbs.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - laradev
-    - bbs
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - laradev
+  - bbs
+  - nginx-proxy

pillars/servers/roles/server/ca.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - ca
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - ca

pillars/servers/roles/server/clark.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - laradev
-    - clark-family
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - laradev
+  - clark-family
+  - nginx-proxy

pillars/servers/roles/server/cloud.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - nextcloud
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - nextcloud
+  - nginx-proxy

pillars/servers/roles/server/emby.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - emby
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - emby

pillars/servers/roles/server/git.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - git
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - git
+  - nginx-proxy

pillars/servers/roles/server/gitea.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - gitea
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - gitea
+  - nginx-proxy

pillars/servers/roles/server/host.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - backup
-    - host
-    - host2
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - backup
+  - host
+  - host2

pillars/servers/roles/server/host2.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - backup
-    - host
-    - host2
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - backup
+  - host
+  - host2

pillars/servers/roles/server/icinga.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - icinga
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - icinga
+  - nginx-proxy

pillars/servers/roles/server/ipa.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - freeipa-server
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - freeipa-server

pillars/servers/roles/server/jackett.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - lxc_container
-    - jackett
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - lxc_container
+  - jackett

pillars/servers/roles/server/lara.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - laradev
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - laradev

pillars/servers/roles/server/lidarr.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - lxc_container
-    - lidarr
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - lxc_container
+  - lidarr

pillars/servers/roles/server/ombi.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - ombi
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - ombi

pillars/servers/roles/server/pass.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - pass
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - pass

pillars/servers/roles/server/pkg.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - pkg-cache
-    - aurutils
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - pkg-cache
+  - aurutils
+  - nginx-proxy

pillars/servers/roles/server/portal.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - portal
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - portal
+  - nginx-proxy

pillars/servers/roles/server/project.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - openproject
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - openproject
+  - nginx-proxy

pillars/servers/roles/server/radarr.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - lxc_container
-    - radarr
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - lxc_container
+  - radarr

pillars/servers/roles/server/router.sls

@@ -1,4 +1,3 @@
-grains:
-  roles:
-    - router
-    - ssh
+roles:
+  - router
+  - ssh

pillars/servers/roles/server/rtorrent.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - windscribe
-    - rtorrent
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - windscribe
+  - rtorrent

pillars/servers/roles/server/salt.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - saltmaster
-    - mirrorlist
-    - certbot
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - saltmaster
+  - mirrorlist
+  - certbot

pillars/servers/roles/server/sonarr.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - lxc_container
-    - sonarr
-    - ytdownloader
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - lxc_container
+  - sonarr
+  - ytdownloader

pillars/servers/roles/server/sql.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - mysql
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - mysql

pillars/servers/roles/server/ssh.sls

@@ -1,7 +1,6 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - sshserver
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - sshserver

pillars/servers/roles/server/sync.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - sync
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - sync
+  - nginx-proxy

pillars/servers/roles/server/transmission.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - nrpe
-    - saltminion
-    - nginx-proxy
-    - windscribe
-    - transmission
+roles:
+  - server
+  - nrpe
+  - saltminion
+  - nginx-proxy
+  - windscribe
+  - transmission

pillars/servers/roles/server/tt.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - ttrss
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - ttrss
+  - nginx-proxy

pillars/servers/roles/server/video.sls

@@ -1,9 +1,8 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - lxc
-    - video
-    - nginx-proxy
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - lxc
+  - video
+  - nginx-proxy

pillars/servers/roles/server/vpn.sls

@@ -1,8 +1,7 @@
-grains:
-  roles:
-    - server
-    - ssh
-    - nrpe
-    - saltminion
-    - vpnserver
-    - ca-cert
+roles:
+  - server
+  - ssh
+  - nrpe
+  - saltminion
+  - vpnserver
+  - ca-cert

states/grains/init.sls

@@ -1,14 +1,12 @@
 {# ensure that grains pillar exists -#}
-{%- if pillar['grains'] is defined -%}
-  {%- if pillar['grains']['roles'] is defined %}
+{%- if pillar['roles'] is defined %}
 set-roles:
   grains.present:
     - name: roles
     - force: true
-    - value: [{% for role in pillar['grains']['roles'] %}{{role}},{% endfor %}]
-  {% else %}
+    - value: [{% for role in pillar['roles'] %}{{role}},{% endfor %}]
+{% else %}
 set-roles:
   grains.absent:
     - name: roles
-  {%- endif -%}
 {%- endif -%}

states/roles/maintain/glances/init.sls

@@ -1,7 +1,7 @@
 {%- set os=grains['os'] -%}
 
 {##check if server is portal##}
-{%- if 'portal' in pillar['grains']['roles'] -%}
+{%- if 'portal' in pillar['roles'] -%}
   {%- set portal = "portal" -%}
 {%- endif -%}
 nginx:

states/roles/maintain/icinga/conf.d/hosts.conf

@@ -7,10 +7,8 @@ object Host "{{server}}.actcur.com" {
   import "generic-host"
   address = "{{server}}.actcur.com"
 
-    {%- if role_data['grains'] is defined %}
-      {%- if role_data['grains']['roles'] is defined %}
-  vars.roles=[{%- for role in role_data['grains']['roles'] %}"{{role}}",{%- endfor -%}""];
-      {%- endif -%}
+    {%- if role_data['roles'] is defined %}
+  vars.roles=[{%- for role in role_data['roles'] %}"{{role}}",{%- endfor -%}""];
     {%- endif %}
     
 }

states/roles/maintain/nginx-proxy/init.sls

@@ -1,7 +1,7 @@
 {%- set os=grains['os'] -%}
 
 {##check if server is portal##}
-{%- if 'portal' in pillar['grains']['roles'] -%}
+{%- if 'portal' in pillar['roles'] -%}
   {%- set portal = "portal" -%}
 {%- endif -%}
 nginx:

states/systems/core/backup/init.sls

@@ -1,6 +1,6 @@
 
 
-{%- if 'backup' in pillar['grains']['roles'] -%}
+{%- if 'backup' in pillar['roles'] -%}
 {%- else -%}
   {##ensure that backup pillar exists##}
   {%- if pillar['backup'] is defined -%}

states/top.sls

@@ -14,8 +14,8 @@
     - systems.core.freeipa
   '*':
 {#- don't run update automatically on containers - updates will be triggered from their host -#}
-{%- if pillar['grains']['roles'] is defined -%}
-  {%- if 'lxc_container' not in pillar['grains']['roles'] %}
+{%- if pillar['roles'] is defined -%}
+  {%- if 'lxc_container' not in pillar['roles'] %}
     - update
   {%- endif -%}
 {%- endif %}
@@ -29,9 +29,9 @@
     - systems.core.mount
     - systems.core.git
     - systems.core.backup
-{%- if grains['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
+{%- if pillar['roles'] is defined -%}
+  {%- if pillar['roles'] is not none -%}
+    {%- for role in pillar['roles'] %}
       {%- if 'roles.maintain.'+role in states %}
     - roles.maintain.{{role}}
       {%- endif -%}