switched to pillar roles wherever possible instead of grain roles

pillars/servers/roles/server/archtest.sls

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

pillars/servers/roles/server/arr.sls

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

pillars/servers/roles/server/atheos.sls

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

pillars/servers/roles/server/authelia.sls

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

pillars/servers/roles/server/baikal.sls

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

pillars/servers/roles/server/base

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

pillars/servers/roles/server/bbs.sls

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

pillars/servers/roles/server/ca.sls

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

pillars/servers/roles/server/clark.sls

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

pillars/servers/roles/server/cloud.sls

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

pillars/servers/roles/server/emby.sls

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

pillars/servers/roles/server/git.sls

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

pillars/servers/roles/server/gitea.sls

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

pillars/servers/roles/server/host.sls

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

pillars/servers/roles/server/host2.sls

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

pillars/servers/roles/server/icinga.sls

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

pillars/servers/roles/server/ipa.sls

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

pillars/servers/roles/server/jackett.sls

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

pillars/servers/roles/server/lara.sls

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

pillars/servers/roles/server/lidarr.sls

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

pillars/servers/roles/server/ombi.sls

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

pillars/servers/roles/server/pass.sls

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

pillars/servers/roles/server/pkg.sls

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

pillars/servers/roles/server/portal.sls

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

pillars/servers/roles/server/project.sls

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

pillars/servers/roles/server/radarr.sls

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

pillars/servers/roles/server/router.sls

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

pillars/servers/roles/server/rtorrent.sls

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

pillars/servers/roles/server/salt.sls

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

pillars/servers/roles/server/sonarr.sls

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

pillars/servers/roles/server/sql.sls

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

pillars/servers/roles/server/ssh.sls

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

pillars/servers/roles/server/sync.sls

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

pillars/servers/roles/server/transmission.sls

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

pillars/servers/roles/server/tt.sls

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

pillars/servers/roles/server/video.sls

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

pillars/servers/roles/server/vpn.sls

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

states/grains/init.sls

@@ -1,14 +1,12 @@
 {# ensure that grains pillar exists -#}
-{%- if pillar['grains'] is defined -%}
+{%- if pillar['roles'] is defined %}
-  {%- if pillar['grains']['roles'] is defined %}
 set-roles:
   grains.present:
     - name: roles
     - force: true
-    - value: [{% for role in pillar['grains']['roles'] %}{{role}},{% endfor %}]
+    - value: [{% for role in pillar['roles'] %}{{role}},{% endfor %}]
-  {% else %}
+{% 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['roles'] is defined %}
-      {%- if role_data['grains']['roles'] is defined %}
+  vars.roles=[{%- for role in role_data['roles'] %}"{{role}}",{%- endfor -%}""];
-  vars.roles=[{%- for role in role_data['grains']['roles'] %}"{{role}}",{%- endfor -%}""];
-      {%- endif -%}
     {%- 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 pillar['roles'] is defined -%}
-  {%- if 'lxc_container' not in pillar['grains']['roles'] %}
+  {%- 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 pillar['roles'] is defined -%}
-  {%- if grains['roles'] is not none -%}
+  {%- if pillar['roles'] is not none -%}
-    {%- for role in grains['roles'] %}
+    {%- for role in pillar['roles'] %}
       {%- if 'roles.maintain.'+role in states %}
     - roles.maintain.{{role}}
       {%- endif -%}