From 726fced83ba306910e2e1ce91d40da5db04358d1 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 22 May 2015 22:31:59 +0200 Subject: cleanup --- global/overlay/etc/puppet/manifests/catlfish/storage.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'global/overlay/etc/puppet/manifests/catlfish/storage.pp') diff --git a/global/overlay/etc/puppet/manifests/catlfish/storage.pp b/global/overlay/etc/puppet/manifests/catlfish/storage.pp index a98e107..a325f3e 100644 --- a/global/overlay/etc/puppet/manifests/catlfish/storage.pp +++ b/global/overlay/etc/puppet/manifests/catlfish/storage.pp @@ -3,13 +3,14 @@ define catlfish::storage( $version = 'latest' ) { - $base = '/var/local/db/urd.appendto.org' + $base = '/var/local/db' + $db = "${base}/${name}" file {$base: ensure => directory } -> - file {"${base}/${name}": ensure => directory } -> + file {$db: ensure => directory } -> sunet::docker_run {'${name}_storage': image => $image, imagetag => $version, - volumes => ["/data/${name}/catlfish:/usr/local/etc/catlfish:ro","${base}/${name}:/var/local/db/catlfish"], + volumes => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"], ports => ["8081:8081"], command => ["storage"] } -- cgit v1.1