fixed squash

pillars/servers/roles/server/archtest.sls

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

pillars/servers/roles/server/arr.sls

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

pillars/servers/roles/server/atheos.sls

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

pillars/servers/roles/server/authelia.sls

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

pillars/servers/roles/server/baikal.sls

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

pillars/servers/roles/server/base

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

pillars/servers/roles/server/bbs.sls

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

pillars/servers/roles/server/ca.sls

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

pillars/servers/roles/server/clark.sls

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

pillars/servers/roles/server/cloud.sls

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

pillars/servers/roles/server/emby.sls

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

pillars/servers/roles/server/git.sls

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

pillars/servers/roles/server/gitea.sls

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

pillars/servers/roles/server/host.sls

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

pillars/servers/roles/server/host2.sls

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

pillars/servers/roles/server/icinga.sls

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

pillars/servers/roles/server/ipa.sls

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

pillars/servers/roles/server/jackett.sls

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

pillars/servers/roles/server/lara.sls

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

pillars/servers/roles/server/lidarr.sls

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

pillars/servers/roles/server/ombi.sls

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

pillars/servers/roles/server/pass.sls

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

pillars/servers/roles/server/pkg.sls

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

pillars/servers/roles/server/portal.sls

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

pillars/servers/roles/server/project.sls

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

pillars/servers/roles/server/radarr.sls

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

pillars/servers/roles/server/router.sls

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

pillars/servers/roles/server/rtorrent.sls

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

pillars/servers/roles/server/salt.sls

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

pillars/servers/roles/server/sonarr.sls

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

pillars/servers/roles/server/sql.sls

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

pillars/servers/roles/server/ssh.sls

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

pillars/servers/roles/server/sync.sls

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

pillars/servers/roles/server/transmission.sls

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

pillars/servers/roles/server/tt.sls

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

pillars/servers/roles/server/video.sls

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

pillars/servers/roles/server/vpn.sls

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

states/grains/init.sls

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

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

@@ -7,8 +7,10 @@ object Host "{{server}}.actcur.com" {
   import "generic-host"
   address = "{{server}}.actcur.com"
 
-    {%- if role_data['roles'] is defined %}
-  vars.roles=[{%- for role in role_data['roles'] %}"{{role}}",{%- endfor -%}""];
+    {%- 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 -%}
     {%- 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['roles'] -%}
+{%- if 'portal' in pillar['grains']['roles'] -%}
   {%- set portal = "portal" -%}
 {%- endif -%}
 nginx:

states/systems/core/backup/init.sls

@@ -1,6 +1,6 @@
 
 
-{%- if 'backup' in pillar['roles'] -%}
+{%- if 'backup' in pillar['grains']['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['roles'] is defined -%}
-  {%- if 'lxc_container' not in pillar['roles'] %}
+{%- if pillar['grains']['roles'] is defined -%}
+  {%- if 'lxc_container' not in pillar['grains']['roles'] %}
     - update
   {%- endif -%}
 {%- endif %}
@@ -29,9 +29,9 @@
     - systems.core.mount
     - systems.core.git
     - systems.core.backup
-{%- if pillar['roles'] is defined -%}
-  {%- if pillar['roles'] is not none -%}
-    {%- for role in pillar['roles'] %}
+{%- if grains['roles'] is defined -%}
+  {%- if grains['roles'] is not none -%}
+    {%- for role in grains['roles'] %}
       {%- if 'roles.maintain.'+role in states %}
     - roles.maintain.{{role}}
       {%- endif -%}