From 6527c64378ebd1970be69f6502db181c8272da5a Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 25 Sep 2019 17:15:11 -0400 Subject: [PATCH] 13647: Migrate arvbox volume config. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- tools/arvbox/lib/arvbox/docker/cluster-config.sh | 13 +++++++++++++ tools/arvbox/lib/arvbox/docker/keep-setup.sh | 3 --- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh index 95c1375437..622871ac5f 100755 --- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh +++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh @@ -149,6 +149,19 @@ Clusters: GitCommand: /usr/share/gitolite3/gitolite-shell GitoliteHome: /var/lib/arvados/git Repositories: /var/lib/arvados/git/repositories + Volumes: + ${uuid_prefix}-nyw5e-000000000000000: + Driver: Directory + DriverParameters: + Root: /var/lib/arvados/keep0 + AccessViaHosts: + "http://localhost:${services[keepstore0]}": {} + ${uuid_prefix}-nyw5e-111111111111111: + Driver: Directory + DriverParameters: + Root: /var/lib/arvados/keep1 + AccessViaHosts: + "http://localhost:${services[keepstore1]}": {} EOF /usr/local/lib/arvbox/yml_override.py /var/lib/arvados/cluster_config.yml diff --git a/tools/arvbox/lib/arvbox/docker/keep-setup.sh b/tools/arvbox/lib/arvbox/docker/keep-setup.sh index 7ac8454d9b..0c4daec1bf 100755 --- a/tools/arvbox/lib/arvbox/docker/keep-setup.sh +++ b/tools/arvbox/lib/arvbox/docker/keep-setup.sh @@ -53,9 +53,6 @@ BlobSigningKeyFile: /var/lib/arvados/blob_signing_key SystemAuthTokenFile: /var/lib/arvados/superuser_token ManagementToken: $management_token MaxBuffers: 20 -Volumes: - - Type: Directory - Root: /var/lib/arvados/$1 EOF exec /usr/local/bin/keepstore -config=/var/lib/arvados/$1.yml -- 2.30.2