From 097a6fd80db407d614c52d4cec70817fbc14e4cc Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 26 May 2015 14:21:18 +0200
Subject: logname as argument to containers

---
 global/overlay/etc/puppet/manifests/catlfish/merge.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'global/overlay/etc/puppet/manifests/catlfish/merge.pp')

diff --git a/global/overlay/etc/puppet/manifests/catlfish/merge.pp b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
index 9334b09..2a54724 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/merge.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/merge.pp
@@ -13,6 +13,6 @@ define catlfish::merge(
        env      => ["MERGE_EXTRA_ARGS=--timing","MERGE_DB_DIR=/var/local/db/catlfish"],
        imagetag => $version,
        volumes  => ["/usr/local/etc/catlfish/${name}:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
-       command  => ["merge ${name}"]
+       command  => ["merge ${name} ${logname}"]
    }
 }
-- 
cgit v1.1