From 57f6066c45c24f8d8bd420890ab8bbb4eb99086a Mon Sep 17 00:00:00 2001 From: Actaeus Curabitur Date: Thu, 8 Sep 2022 10:24:41 -0500 Subject: [PATCH] switched to pillar roles wherever possible instead of grain roles --- pillars/servers/roles/server/archtest.sls | 11 ++++---- pillars/servers/roles/server/arr.sls | 25 +++++++++---------- pillars/servers/roles/server/atheos.sls | 15 ++++++----- pillars/servers/roles/server/authelia.sls | 15 ++++++----- pillars/servers/roles/server/baikal.sls | 15 ++++++----- pillars/servers/roles/server/base | 11 ++++---- pillars/servers/roles/server/bbs.sls | 17 ++++++------- pillars/servers/roles/server/ca.sls | 13 +++++----- pillars/servers/roles/server/clark.sls | 17 ++++++------- pillars/servers/roles/server/cloud.sls | 15 ++++++----- pillars/servers/roles/server/emby.sls | 13 +++++----- pillars/servers/roles/server/git.sls | 15 ++++++----- pillars/servers/roles/server/gitea.sls | 15 ++++++----- pillars/servers/roles/server/host.sls | 17 ++++++------- pillars/servers/roles/server/host2.sls | 17 ++++++------- pillars/servers/roles/server/icinga.sls | 15 ++++++----- pillars/servers/roles/server/ipa.sls | 13 +++++----- pillars/servers/roles/server/jackett.sls | 13 +++++----- pillars/servers/roles/server/lara.sls | 13 +++++----- pillars/servers/roles/server/lidarr.sls | 13 +++++----- pillars/servers/roles/server/ombi.sls | 13 +++++----- pillars/servers/roles/server/pass.sls | 15 ++++++----- pillars/servers/roles/server/pkg.sls | 17 ++++++------- pillars/servers/roles/server/portal.sls | 15 ++++++----- pillars/servers/roles/server/project.sls | 15 ++++++----- pillars/servers/roles/server/radarr.sls | 13 +++++----- pillars/servers/roles/server/router.sls | 7 +++--- pillars/servers/roles/server/rtorrent.sls | 15 ++++++----- pillars/servers/roles/server/salt.sls | 17 ++++++------- pillars/servers/roles/server/sonarr.sls | 15 ++++++----- pillars/servers/roles/server/sql.sls | 13 +++++----- pillars/servers/roles/server/ssh.sls | 13 +++++----- pillars/servers/roles/server/sync.sls | 15 ++++++----- pillars/servers/roles/server/transmission.sls | 15 ++++++----- pillars/servers/roles/server/tt.sls | 15 ++++++----- pillars/servers/roles/server/video.sls | 17 ++++++------- pillars/servers/roles/server/vpn.sls | 15 ++++++----- states/grains/init.sls | 8 +++--- states/roles/maintain/glances/init.sls | 2 +- .../roles/maintain/icinga/conf.d/hosts.conf | 6 ++--- states/roles/maintain/nginx-proxy/init.sls | 2 +- states/systems/core/backup/init.sls | 2 +- states/top.sls | 10 ++++---- 43 files changed, 266 insertions(+), 307 deletions(-) diff --git a/pillars/servers/roles/server/archtest.sls b/pillars/servers/roles/server/archtest.sls index 0a9b10c..c909485 100644 --- a/pillars/servers/roles/server/archtest.sls +++ b/pillars/servers/roles/server/archtest.sls @@ -1,6 +1,5 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion +roles: + - server + - ssh + - nrpe + - saltminion diff --git a/pillars/servers/roles/server/arr.sls b/pillars/servers/roles/server/arr.sls index 1ab8ea6..631d55e 100644 --- a/pillars/servers/roles/server/arr.sls +++ b/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 diff --git a/pillars/servers/roles/server/atheos.sls b/pillars/servers/roles/server/atheos.sls index fdb5881..10f6aca 100644 --- a/pillars/servers/roles/server/atheos.sls +++ b/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 diff --git a/pillars/servers/roles/server/authelia.sls b/pillars/servers/roles/server/authelia.sls index 16f313e..f5bf1cb 100644 --- a/pillars/servers/roles/server/authelia.sls +++ b/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 diff --git a/pillars/servers/roles/server/baikal.sls b/pillars/servers/roles/server/baikal.sls index 1c789f6..8f0f79e 100644 --- a/pillars/servers/roles/server/baikal.sls +++ b/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 diff --git a/pillars/servers/roles/server/base b/pillars/servers/roles/server/base index 0a9b10c..c909485 100644 --- a/pillars/servers/roles/server/base +++ b/pillars/servers/roles/server/base @@ -1,6 +1,5 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion +roles: + - server + - ssh + - nrpe + - saltminion diff --git a/pillars/servers/roles/server/bbs.sls b/pillars/servers/roles/server/bbs.sls index 7a1e72f..0b61f0b 100644 --- a/pillars/servers/roles/server/bbs.sls +++ b/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 diff --git a/pillars/servers/roles/server/ca.sls b/pillars/servers/roles/server/ca.sls index f2560f0..19f5c12 100644 --- a/pillars/servers/roles/server/ca.sls +++ b/pillars/servers/roles/server/ca.sls @@ -1,7 +1,6 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion - - ca +roles: + - server + - ssh + - nrpe + - saltminion + - ca diff --git a/pillars/servers/roles/server/clark.sls b/pillars/servers/roles/server/clark.sls index 03fbe64..9b0193c 100644 --- a/pillars/servers/roles/server/clark.sls +++ b/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 diff --git a/pillars/servers/roles/server/cloud.sls b/pillars/servers/roles/server/cloud.sls index 5aec2cb..23838ae 100644 --- a/pillars/servers/roles/server/cloud.sls +++ b/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 diff --git a/pillars/servers/roles/server/emby.sls b/pillars/servers/roles/server/emby.sls index 8f39d8d..db8c88a 100644 --- a/pillars/servers/roles/server/emby.sls +++ b/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 diff --git a/pillars/servers/roles/server/git.sls b/pillars/servers/roles/server/git.sls index 6ec96d3..e85060c 100644 --- a/pillars/servers/roles/server/git.sls +++ b/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 diff --git a/pillars/servers/roles/server/gitea.sls b/pillars/servers/roles/server/gitea.sls index b153b84..1352b69 100644 --- a/pillars/servers/roles/server/gitea.sls +++ b/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 diff --git a/pillars/servers/roles/server/host.sls b/pillars/servers/roles/server/host.sls index ef830af..0ce3310 100644 --- a/pillars/servers/roles/server/host.sls +++ b/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 diff --git a/pillars/servers/roles/server/host2.sls b/pillars/servers/roles/server/host2.sls index ef830af..0ce3310 100644 --- a/pillars/servers/roles/server/host2.sls +++ b/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 diff --git a/pillars/servers/roles/server/icinga.sls b/pillars/servers/roles/server/icinga.sls index 18d2e44..c4ff3aa 100644 --- a/pillars/servers/roles/server/icinga.sls +++ b/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 diff --git a/pillars/servers/roles/server/ipa.sls b/pillars/servers/roles/server/ipa.sls index a57b175..f4a8da3 100644 --- a/pillars/servers/roles/server/ipa.sls +++ b/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 diff --git a/pillars/servers/roles/server/jackett.sls b/pillars/servers/roles/server/jackett.sls index 6a48fbe..afbf0c5 100644 --- a/pillars/servers/roles/server/jackett.sls +++ b/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 diff --git a/pillars/servers/roles/server/lara.sls b/pillars/servers/roles/server/lara.sls index 901ff79..0bc9f31 100644 --- a/pillars/servers/roles/server/lara.sls +++ b/pillars/servers/roles/server/lara.sls @@ -1,7 +1,6 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion - - laradev +roles: + - server + - ssh + - nrpe + - saltminion + - laradev diff --git a/pillars/servers/roles/server/lidarr.sls b/pillars/servers/roles/server/lidarr.sls index 37129d9..9875a2a 100644 --- a/pillars/servers/roles/server/lidarr.sls +++ b/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 diff --git a/pillars/servers/roles/server/ombi.sls b/pillars/servers/roles/server/ombi.sls index 19bc3de..8041828 100644 --- a/pillars/servers/roles/server/ombi.sls +++ b/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 diff --git a/pillars/servers/roles/server/pass.sls b/pillars/servers/roles/server/pass.sls index 3c0c344..bc6a9f2 100644 --- a/pillars/servers/roles/server/pass.sls +++ b/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 diff --git a/pillars/servers/roles/server/pkg.sls b/pillars/servers/roles/server/pkg.sls index e49b3f5..8b1e3ff 100644 --- a/pillars/servers/roles/server/pkg.sls +++ b/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 diff --git a/pillars/servers/roles/server/portal.sls b/pillars/servers/roles/server/portal.sls index 4d08cb2..644a9da 100644 --- a/pillars/servers/roles/server/portal.sls +++ b/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 diff --git a/pillars/servers/roles/server/project.sls b/pillars/servers/roles/server/project.sls index e5978c7..a474c70 100644 --- a/pillars/servers/roles/server/project.sls +++ b/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 diff --git a/pillars/servers/roles/server/radarr.sls b/pillars/servers/roles/server/radarr.sls index 1e4128b..2221c68 100644 --- a/pillars/servers/roles/server/radarr.sls +++ b/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 diff --git a/pillars/servers/roles/server/router.sls b/pillars/servers/roles/server/router.sls index d556988..6e500e4 100644 --- a/pillars/servers/roles/server/router.sls +++ b/pillars/servers/roles/server/router.sls @@ -1,4 +1,3 @@ -grains: - roles: - - router - - ssh +roles: + - router + - ssh diff --git a/pillars/servers/roles/server/rtorrent.sls b/pillars/servers/roles/server/rtorrent.sls index 46cc181..a9695a9 100644 --- a/pillars/servers/roles/server/rtorrent.sls +++ b/pillars/servers/roles/server/rtorrent.sls @@ -1,8 +1,7 @@ -grains: - roles: - - server - - nrpe - - saltminion - - nginx-proxy - - windscribe - - rtorrent \ No newline at end of file +roles: + - server + - nrpe + - saltminion + - nginx-proxy + - windscribe + - rtorrent diff --git a/pillars/servers/roles/server/salt.sls b/pillars/servers/roles/server/salt.sls index 759911f..a0eaf5f 100644 --- a/pillars/servers/roles/server/salt.sls +++ b/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 diff --git a/pillars/servers/roles/server/sonarr.sls b/pillars/servers/roles/server/sonarr.sls index 3e80142..1216cdb 100644 --- a/pillars/servers/roles/server/sonarr.sls +++ b/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 diff --git a/pillars/servers/roles/server/sql.sls b/pillars/servers/roles/server/sql.sls index 044c620..aa9c5f0 100644 --- a/pillars/servers/roles/server/sql.sls +++ b/pillars/servers/roles/server/sql.sls @@ -1,7 +1,6 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion - - mysql +roles: + - server + - ssh + - nrpe + - saltminion + - mysql diff --git a/pillars/servers/roles/server/ssh.sls b/pillars/servers/roles/server/ssh.sls index bbee929..dd478e7 100644 --- a/pillars/servers/roles/server/ssh.sls +++ b/pillars/servers/roles/server/ssh.sls @@ -1,7 +1,6 @@ -grains: - roles: - - server - - ssh - - nrpe - - saltminion - - sshserver +roles: + - server + - ssh + - nrpe + - saltminion + - sshserver diff --git a/pillars/servers/roles/server/sync.sls b/pillars/servers/roles/server/sync.sls index 10bf144..a8e1394 100644 --- a/pillars/servers/roles/server/sync.sls +++ b/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 diff --git a/pillars/servers/roles/server/transmission.sls b/pillars/servers/roles/server/transmission.sls index 1165323..d058991 100644 --- a/pillars/servers/roles/server/transmission.sls +++ b/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 diff --git a/pillars/servers/roles/server/tt.sls b/pillars/servers/roles/server/tt.sls index 8989c9a..0d51b92 100644 --- a/pillars/servers/roles/server/tt.sls +++ b/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 diff --git a/pillars/servers/roles/server/video.sls b/pillars/servers/roles/server/video.sls index bc0b579..df3008e 100644 --- a/pillars/servers/roles/server/video.sls +++ b/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 diff --git a/pillars/servers/roles/server/vpn.sls b/pillars/servers/roles/server/vpn.sls index 940c86f..641935d 100644 --- a/pillars/servers/roles/server/vpn.sls +++ b/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 diff --git a/states/grains/init.sls b/states/grains/init.sls index 90da249..229abb5 100644 --- a/states/grains/init.sls +++ b/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 -%} diff --git a/states/roles/maintain/glances/init.sls b/states/roles/maintain/glances/init.sls index 77b9290..4752a66 100644 --- a/states/roles/maintain/glances/init.sls +++ b/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: diff --git a/states/roles/maintain/icinga/conf.d/hosts.conf b/states/roles/maintain/icinga/conf.d/hosts.conf index aea039d..67dccb3 100644 --- a/states/roles/maintain/icinga/conf.d/hosts.conf +++ b/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 %} } diff --git a/states/roles/maintain/nginx-proxy/init.sls b/states/roles/maintain/nginx-proxy/init.sls index 466259d..ebc60f3 100644 --- a/states/roles/maintain/nginx-proxy/init.sls +++ b/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: diff --git a/states/systems/core/backup/init.sls b/states/systems/core/backup/init.sls index c46016f..e666ab4 100644 --- a/states/systems/core/backup/init.sls +++ b/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 -%} diff --git a/states/top.sls b/states/top.sls index 6cb7166..d5df904 100644 --- a/states/top.sls +++ b/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 -%}