Merge pull request 'Change redis to redis7' (#75) from salt-redis7 into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful

Reviewed-on: #75
Reviewed-by: Pratyush Desai <pratyush.desai@liberta.casa>
This commit is contained in:
Georg Pfuetzenreuter 2023-06-28 22:00:16 +02:00
commit 1bd2f39312

View File

@ -41,7 +41,7 @@ salt_master_extra_packages:
- python3-ldap - python3-ldap
- python3-pynetbox - python3-pynetbox
- python3-redis - python3-redis
- redis - redis7
- salt-bash-completion - salt-bash-completion
- salt-fish-completion - salt-fish-completion
- salt-keydiff - salt-keydiff
@ -68,7 +68,7 @@ salt_master_extra_packages:
- group: redis - group: redis
- mode: '0640' - mode: '0640'
- require: - require:
- pkg: redis - pkg: redis7
/var/lib/redis/salt: /var/lib/redis/salt:
file.directory: file.directory:
@ -76,19 +76,19 @@ salt_master_extra_packages:
- group: redis - group: redis
- mode: '0750' - mode: '0750'
- require: - require:
- pkg: redis - pkg: redis7
salt_redis_service_enable: salt_redis_service_enable:
service.enabled: service.enabled:
- name: {{ redis_service }} - name: {{ redis_service }}
- require: - require:
- pkg: redis - pkg: redis7
salt_redis_service_start: salt_redis_service_start:
service.running: service.running:
- name: {{ redis_service }} - name: {{ redis_service }}
- require: - require:
- pkg: redis - pkg: redis7
- watch: - watch:
- file: {{ redis_config }} - file: {{ redis_config }}
@ -96,7 +96,7 @@ salt_redis_membership:
group.present: group.present:
- name: redis - name: redis
- require: - require:
- pkg: redis - pkg: redis7
- addusers: - addusers:
- {{ master_pillar['user'] }} - {{ master_pillar['user'] }}
{%- if pillar['secret_salt'] is defined %} {%- if pillar['secret_salt'] is defined %}