Commit 979e40ca authored by MUSSET Paul's avatar MUSSET Paul
Browse files

Merge branch 'stability' into 'dev'

Stability

See merge request !21
parents 60d5ec65 ff96de0d
---
- name: install and launch an XCache instance
hosts: xcache_instance
hosts: integration
roles:
- xcache
......@@ -68,6 +68,7 @@
ansible.builtin.service:
name: docker
state: started
enabled: yes
- name: install docker-compose
ansible.builtin.pip:
......
......@@ -42,7 +42,6 @@
project_src: /root/compose-config
project_name: xcache
remove_orphans: yes
debug: yes
pull: yes
state: present
vars:
......
......@@ -14,10 +14,7 @@
- name: create /mnt/xcache/{{ directory.dir_name }}
ansible.builtin.file:
group: xrootd
owner: xrootd
path: "/mnt/xcache/{{ directory.dir_name }}"
recurse: yes
state: directory
- name: mount /mnt/xcache/{{ directory.dir_name }}
......@@ -27,3 +24,11 @@
path: "/mnt/xcache/{{ directory.dir_name }}"
src: "/dev/mapper/{{ directory.vg_name }}-xcache_{{ directory.dir_name }}"
state: mounted
- name: make xrootd owner of /mnt/xcache/{{ directory.dir_name }}
ansible.builtin.file:
group: xrootd
owner: xrootd
path: "/mnt/xcache/{{ directory.dir_name }}"
recurse: yes
state: directory
version: '3.8'
services:
xcache-certificate-standalone:
xcache:
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/xcache:dev
ports:
- "1094:1094"
......@@ -32,6 +32,7 @@ services:
- source: key
target: xrdkey.pem
mode: 0400
restart: always
voms-renewer:
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/voms-proxy-init:dev
......@@ -48,12 +49,16 @@ services:
- source: key
target: xrdkey.pem
mode: 0400
restart: always
{% if test_machine is defined and test_machine %}
flusher:
image: gitlab-registry.in2p3.fr/bastien.gounon/xcache-flusher:latest
ports:
- "80:80"
depends_on:
- voms-renewer
- xcache
volumes:
- type: bind
source: /mnt/xcache/ns
......@@ -66,6 +71,7 @@ services:
source: {{ directory.path }}
target: {{ directory.path }}
{% endfor %}
restart: always
environment:
FLUSHER_DIR: /mnt/xcache/ns/,/mnt/xcache/metadata/meta,{% for directory in disks_list.files %}{{ directory.path }}/data{%- if not loop.last %},{% endif %}{% endfor %}
......
......@@ -68,7 +68,7 @@ services:
source: /mnt/xcache/storage/data2
target: /mnt/xcache/storage/data2
environment:
FLUSHER_DIR: /mnt/xcache-ns/,/mnt/xcache-meta/meta,/mnt/xcache-storage/data1/data/,/mnt/xcache-storage/data2/data
FLUSHER_DIR: /mnt/xcache/ns/,/mnt/xcache/metadata/meta,/mnt/xcache/storage/data1/data/,/mnt/xcache/storage/data2/data
FLUSHER_PORT: 80
networks:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment