diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index e24290a14..d0a40df90 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -766,7 +766,9 @@ post_to_2.3.260() { } post_to_2.3.270() { - echo "Nothing to do for .270" + echo "Pruning unused volumes" + docker volume prune -f + POSTVERSION=2.3.270 } diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 57195c21c..ee721d9ee 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -84,6 +84,14 @@ playbook_password_none: {% else %} +playbookfilesdir: + file.directory: + - name: /opt/so/conf/playbook/redmine-files + - dir_mode: 775 + - user: 939 + - group: 939 + - makedirs: True + so-playbook: docker_container.running: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-playbook:{{ VERSION }} @@ -91,6 +99,7 @@ so-playbook: - name: so-playbook - binds: - /opt/so/log/playbook:/playbook/log:rw + - /opt/so/conf/playbook/redmine-files:/usr/src/redmine/files:rw - environment: - REDMINE_DB_MYSQL={{ MANAGERIP }} - REDMINE_DB_DATABASE=playbook diff --git a/salt/redis/init.sls b/salt/redis/init.sls index bb1c134cb..5cb349ee4 100644 --- a/salt/redis/init.sls +++ b/salt/redis/init.sls @@ -52,6 +52,13 @@ redisconf: - group: 939 - template: jinja +redisdatadir: + file.directory: + - name: /nsm/redis/data + - user: 939 + - group: 939 + - makedirs: True + so-redis: docker_container.running: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} @@ -64,6 +71,7 @@ so-redis: - /opt/so/log/redis:/var/log/redis:rw - /opt/so/conf/redis/etc/redis.conf:/usr/local/etc/redis/redis.conf:ro - /opt/so/conf/redis/working:/redis:rw + - /nsm/redis/data:/data:rw - /etc/pki/redis.crt:/certs/redis.crt:ro - /etc/pki/redis.key:/certs/redis.key:ro {% if grains['role'] in ['so-manager', 'so-helix', 'so-managersearch', 'so-standalone', 'so-import'] %} diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index 66cc1b9b7..9d374403b 100644 --- a/salt/strelka/init.sls +++ b/salt/strelka/init.sls @@ -194,9 +194,25 @@ filcheck_history_clean: - minute: '33' # End Filecheck Section +strelkagkredisdatadir: + file.directory: + - name: /nsm/strelka/gk-redis-data + - user: 939 + - group: 939 + - makedirs: True + +strelkacoordredisdatadir: + file.directory: + - name: /nsm/strelka/coord-redis-data + - user: 939 + - group: 939 + - makedirs: True + strelka_coordinator: docker_container.running: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} + - binds: + - /nsm/strelka/coord-redis-data:/data:rw - name: so-strelka-coordinator - entrypoint: redis-server --save "" --appendonly no - port_bindings: @@ -210,6 +226,8 @@ append_so-strelka-coordinator_so-status.conf: strelka_gatekeeper: docker_container.running: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} + - binds: + - /nsm/strelka/gk-redis-data:/data:rw - name: so-strelka-gatekeeper - entrypoint: redis-server --save "" --appendonly no --maxmemory-policy allkeys-lru - port_bindings: