Merge remote-tracking branch 'origin/prod' into fix_grains

pillars/servers/roles/server/archtest.sls

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

pillars/servers/roles/server/arr.sls

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

pillars/servers/roles/server/atheos.sls

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

pillars/servers/roles/server/authelia.sls

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

pillars/servers/roles/server/baikal.sls

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

pillars/servers/roles/server/base

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

pillars/servers/roles/server/bbs.sls

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

pillars/servers/roles/server/ca.sls

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

pillars/servers/roles/server/clark.sls

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

pillars/servers/roles/server/cloud.sls

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

pillars/servers/roles/server/emby.sls

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

pillars/servers/roles/server/git.sls

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

pillars/servers/roles/server/gitea.sls

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

pillars/servers/roles/server/host.sls

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

pillars/servers/roles/server/host2.sls

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

pillars/servers/roles/server/icinga.sls

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

pillars/servers/roles/server/ipa.sls

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

pillars/servers/roles/server/jackett.sls

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

pillars/servers/roles/server/lara.sls

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

pillars/servers/roles/server/lidarr.sls

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

pillars/servers/roles/server/ombi.sls

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

pillars/servers/roles/server/pass.sls

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

pillars/servers/roles/server/pkg.sls

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

pillars/servers/roles/server/portal.sls

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

pillars/servers/roles/server/project.sls

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

pillars/servers/roles/server/radarr.sls

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

pillars/servers/roles/server/router.sls

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

pillars/servers/roles/server/rtorrent.sls

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

pillars/servers/roles/server/salt.sls

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

pillars/servers/roles/server/sonarr.sls

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

pillars/servers/roles/server/sql.sls

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

pillars/servers/roles/server/ssh.sls

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

pillars/servers/roles/server/sync.sls

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

pillars/servers/roles/server/transmission.sls

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

pillars/servers/roles/server/tt.sls

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

pillars/servers/roles/server/video.sls

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

pillars/servers/roles/server/vpn.sls

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

pillars/top.sls

@@ -1,6 +1,6 @@
-{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{%- for branch in branches %}
+{%- for env in envs %}
-{{branch}}:
+{{env}}:
   '*':
     - roles
     - servers

squash.sh

@@ -7,7 +7,7 @@ git reset --hard qual;
 git push --force;
 
 #merge to master
-git checkout -B prod origin/master;
+git checkout -B prod origin/prod;
 git merge --squash qual;
 git commit -am "$cm";
 git push;

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/roles/maintain/saltmaster/master

@@ -1,3 +1,4 @@
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
 ##### Primary configuration settings #####
 ##########################################
 # This configuration file is used to manage the behavior of the Salt Master.
@@ -422,14 +423,10 @@ state_output: terse
 #     - /srv/salt/prod/states
 #
 file_roots:
-{%- if pillar['branches'] is defined -%}
+{%- for env in envs %}
-{%- if pillar['branches']['saltmaster'] is defined -%}
+  {{env}}:
-{%- for branch in pillar['branches']['saltmaster'] %}
+    - /srv/salt/{{env}}/states
-  {{branch}}:
-    - /srv/salt/{{branch}}/states
 {%- endfor %}
-{%- endif %}
-{%- endif %}
 #
 
 # When using multiple environments, each with their own top file, the
@@ -441,15 +438,11 @@ file_roots:
 # To specify the order in which environments are merged, set the ordering
 # in the env_order option. Given a conflict, the last matching value will
 # win.
-{% if pillar['branches'] is defined -%}
-{%- if pillar['branches']['saltmaster'] is defined -%}
 env_order: [
-{%- for branch in pillar['branches']['saltmaster'] -%}
+{%- for env in envs -%}
-  '{{-branch}}',
+  '{{env}}',
 {%- endfor -%}
 'null']
-{%- endif %}
-{%- endif %}
 
 # If top_file_merging_strategy is set to 'same' and an environment does not
 # contain a top file, the top file in the environment specified by default_top
@@ -570,14 +563,10 @@ hash_type: sha256
 #    - /srv/pillar
 #
 pillar_roots:
-{%- if pillar['branches'] is defined -%}
+{%- for env in envs %}
-{%- if pillar['branches']['saltmaster'] is defined -%}
+  {{env}}:
-{%- for branch in pillar['branches']['saltmaster'] %}
+    - /srv/salt/{{env}}/pillars
-  {{branch}}:
-    - /srv/salt/{{branch}}/pillars
 {%- endfor %}
-{%- endif %}
-{%- endif %}
 #
 #ext_pillar:
 #  - hiera: /etc/hiera.yaml

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/test

@@ -1,18 +1,5 @@
-{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-branches:
+{% for env in envs %}
-  saltmaster:
+{{ env }}:
-{%- for branch in branches %}
+  'os_family:RedHat':
-    - {{branch}}
+{% endfor %}
-{%- endfor %}
-
-git:
-{%- for branch in branches %}
-  salt_{{branch}}:
-    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
-    path: "/srv/salt/{{branch}}"
-    branch: "{{branch}}"
-    key: "git_actcur"
-    force: {{ "True" if branch == "prod" else "false" }}
-    email: "actcur@actcur.com"
-    name: "Actaeus Curabitur"
-{%- endfor %}

states/top.sls

@@ -1,10 +1,7 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- if pillar['branches'] is defined -%}
+{%- set envs=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
-{%- if pillar['branches']['saltmaster'] is defined -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{%- set envs = pillar['branches']['saltmaster'] -%}
-{%- endif -%}
-{%- endif -%}
 {% for env in envs %}
 {{ env }}:
   'os_family:RedHat':
@@ -17,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 %}
@@ -32,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 -%}