known roots, nw configct-ops-2015-05-26-v01

1 files changed, 6 insertions, 5 deletions

diff --git a/global/overlay/etc/puppet/manifests/catlfish/merge.pp b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
index df69e91..9334b09 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/merge.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
@@ -1,17 +1,18 @@
 define catlfish::merge(
+      $logname  = undef,
       $image    = 'docker.sunet.se/ctct/catlfish-dev',
       $version  = 'latest'
 )
 {
    $base = '/var/local/db'
-   $db = ""${base}/${name}"
+   $db = ""${base}/${logname}"
    file {$base: ensure => directory } ->
    file {$db: ensure => directory } ->
-   sunet::docker_run {'${name}_merge':
+   sunet::docker_run {"${name}_catlfish":
        image    => $image,
-       env      => ["MERGE_EXTRA_ARGS=--timing"],
+       env      => ["MERGE_EXTRA_ARGS=--timing","MERGE_DB_DIR=/var/local/db/catlfish"],
        imagetag => $version,
-       volumes  => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
-       command  => ["merge /var/local/db/catlfish"]
+       volumes  => ["/usr/local/etc/catlfish/${name}:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
+       command  => ["merge ${name}"]
    }
 }