cleanupct-ops-2015-05-22-v04

1 files changed, 4 insertions, 3 deletions

diff --git a/global/overlay/etc/puppet/manifests/catlfish/merge.pp b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
index 5be25a3..df69e91 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/merge.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
@@ -3,14 +3,15 @@ define catlfish::merge(
       $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}_merge':
        image    => $image,
        env      => ["MERGE_EXTRA_ARGS=--timing"],
        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"],
        command  => ["merge /var/local/db/catlfish"]
    }
 }