Commit 64d9919e authored by MUSSET Paul's avatar MUSSET Paul
Browse files

normalized xcache directory names everywhere

parent 6556de51
Pipeline #92491 passed with stage
in 4 minutes and 47 seconds
......@@ -16,7 +16,7 @@ pss.cachelib libXrdFileCache.so
oss.localroot /mnt/xcache/ns
# Metadata directories (cinfo files)
oss.space meta /mnt/xcache/meta
oss.space meta /mnt/xcache/metadata
# Data directories
oss.space data /mnt/xcache/storage/data*
......
......@@ -13,7 +13,7 @@ services:
target: /mnt/xcache/ns
- type: bind
source: /mnt/xcache/metadata
target: /mnt/xcache/meta
target: /mnt/xcache/metadata
{% for directory in disks_list.files %}
- type: bind
source: {{ directory.path }}
......@@ -43,7 +43,7 @@ services:
target: /mnt/xcache/ns
- type: bind
source: /mnt/xcache/metadata
target: /mnt/xcache/meta
target: /mnt/xcache/metadata
{% for directory in disks_list.files %}
- type: bind
source: {{ directory.path }}
......
......@@ -48,8 +48,8 @@ RUN mkdir -p /mnt/xcache/ns/\
&& chown xrootd:xrootd /mnt/xcache/ns/
# Directory keeping the metadata
RUN mkdir -p /mnt/xcache/meta/\
&& chown xrootd:xrootd /mnt/xcache/meta/
RUN mkdir -p /mnt/xcache/metadata/\
&& chown xrootd:xrootd /mnt/xcache/metadata/
# Directory to mount the data disks. need to have same uid+gid on host and container
RUN mkdir -p /mnt/xcache/storage\
......
......@@ -2,24 +2,24 @@ version: '3.8'
services:
xcache-certificate-standalone:
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/xcache:separate-data-meta
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/xcache:dev
ports:
- "1094:1094"
depends_on:
- voms-renewer
volumes:
- type: bind
source: /mnt/xcache-ns
target: /mnt/xcache-ns
source: /mnt/xcache/ns
target: /mnt/xcache/ns
- type: bind
source: /mnt/xcache-meta
target: /mnt/xcache-meta
source: /mnt/xcache/metadata
target: /mnt/xcache/metadata
- type: bind
source: /mnt/xcache-storage/data1
target: /mnt/xcache-storage/data1
source: /mnt/xcache/storage/data1
target: /mnt/xcache/storage/data1
- type: bind
source: /mnt/xcache-storage/data2
target: /mnt/xcache-storage/data2
source: /mnt/xcache/storage/data2
target: /mnt/xcache/storage/data2
- type: bind
source: ./config
target: /etc/xrootd
......@@ -35,7 +35,7 @@ services:
mode: 0400
voms-renewer:
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/voms-proxy-init:separate-data-meta
image: gitlab-registry.in2p3.fr/cc-escape/xcache-config/voms-proxy-init:dev
ports:
- "15000:15000"
volumes:
......@@ -56,17 +56,17 @@ services:
- "80:80"
volumes:
- type: bind
source: /mnt/xcache-ns
target: /mnt/xcache-ns
source: /mnt/xcache/ns
target: /mnt/xcache/ns
- type: bind
source: /mnt/xcache-meta
target: /mnt/xcache-meta
source: /mnt/xcache/metadata
target: /mnt/xcache/metadata
- type: bind
source: /mnt/xcache-storage/data1
target: /mnt/xcache-storage/data1
source: /mnt/xcache/storage/data1
target: /mnt/xcache/storage/data1
- type: bind
source: /mnt/xcache-storage/data2
target: /mnt/xcache-storage/data2
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_PORT: 80
......
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