vol sprawl

This commit is contained in:
Jason Ertel
2023-09-19 12:52:28 -04:00
parent 7763218b71
commit 8855619453
4 changed files with 24 additions and 1 deletions

View File

@@ -766,7 +766,9 @@ post_to_2.3.260() {
} }
post_to_2.3.270() { post_to_2.3.270() {
echo "Nothing to do for .270" echo "Pruning unused volumes"
docker volume prune -f
POSTVERSION=2.3.270 POSTVERSION=2.3.270
} }

View File

@@ -84,6 +84,14 @@ playbook_password_none:
{% else %} {% else %}
playbookfilesdir:
file.directory:
- name: /opt/so/conf/playbook/redmine-files
- dir_mode: 775
- user: 939
- group: 939
- makedirs: True
so-playbook: so-playbook:
docker_container.running: docker_container.running:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-playbook:{{ VERSION }} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-playbook:{{ VERSION }}
@@ -91,6 +99,7 @@ so-playbook:
- name: so-playbook - name: so-playbook
- binds: - binds:
- /opt/so/log/playbook:/playbook/log:rw - /opt/so/log/playbook:/playbook/log:rw
- /opt/so/conf/playbook/redmine-files:/usr/src/redmine/files:rw
- environment: - environment:
- REDMINE_DB_MYSQL={{ MANAGERIP }} - REDMINE_DB_MYSQL={{ MANAGERIP }}
- REDMINE_DB_DATABASE=playbook - REDMINE_DB_DATABASE=playbook

View File

@@ -52,6 +52,13 @@ redisconf:
- group: 939 - group: 939
- template: jinja - template: jinja
redisdatadir:
file.directory:
- name: /nsm/redis/data
- user: 939
- group: 939
- makedirs: True
so-redis: so-redis:
docker_container.running: docker_container.running:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }}
@@ -64,6 +71,7 @@ so-redis:
- /opt/so/log/redis:/var/log/redis:rw - /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/etc/redis.conf:/usr/local/etc/redis/redis.conf:ro
- /opt/so/conf/redis/working:/redis:rw - /opt/so/conf/redis/working:/redis:rw
- /nsm/redis/data:/data:rw
- /etc/pki/redis.crt:/certs/redis.crt:ro - /etc/pki/redis.crt:/certs/redis.crt:ro
- /etc/pki/redis.key:/certs/redis.key:ro - /etc/pki/redis.key:/certs/redis.key:ro
{% if grains['role'] in ['so-manager', 'so-helix', 'so-managersearch', 'so-standalone', 'so-import'] %} {% if grains['role'] in ['so-manager', 'so-helix', 'so-managersearch', 'so-standalone', 'so-import'] %}

View File

@@ -197,6 +197,8 @@ filcheck_history_clean:
strelka_coordinator: strelka_coordinator:
docker_container.running: docker_container.running:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }}
- bind:
- /nsm/strelka/coord-redis-data:/data:rw
- name: so-strelka-coordinator - name: so-strelka-coordinator
- entrypoint: redis-server --save "" --appendonly no - entrypoint: redis-server --save "" --appendonly no
- port_bindings: - port_bindings:
@@ -210,6 +212,8 @@ append_so-strelka-coordinator_so-status.conf:
strelka_gatekeeper: strelka_gatekeeper:
docker_container.running: docker_container.running:
- image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }} - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-redis:{{ VERSION }}
- bind:
- /nsm/strelka/gk-redis-data:/data:rw
- name: so-strelka-gatekeeper - name: so-strelka-gatekeeper
- entrypoint: redis-server --save "" --appendonly no --maxmemory-policy allkeys-lru - entrypoint: redis-server --save "" --appendonly no --maxmemory-policy allkeys-lru
- port_bindings: - port_bindings: