summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/manifests/catlfish/merge.pp
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-05-26 14:21:18 +0200
committerLeif Johansson <leifj@sunet.se>2015-05-26 14:21:18 +0200
commit097a6fd80db407d614c52d4cec70817fbc14e4cc (patch)
tree5d271d2e56bb27ca1fb375ee015c9131b04c32c1 /global/overlay/etc/puppet/manifests/catlfish/merge.pp
parentd284dcced21429aa414f21b4f5e67bdebc651971 (diff)
logname as argument to containersct-ops-2015-05-26-v02
Diffstat (limited to 'global/overlay/etc/puppet/manifests/catlfish/merge.pp')
-rw-r--r--global/overlay/etc/puppet/manifests/catlfish/merge.pp2
1 files changed, 1 insertions, 1 deletions
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}"]
}
}