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

1 files changed, 4 insertions, 3 deletions

diff --git a/global/overlay/etc/puppet/manifests/catlfish/storage.pp b/global/overlay/etc/puppet/manifests/catlfish/storage.pp
index a325f3e..2e7191e 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/storage.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/storage.pp
@@ -1,18 +1,19 @@
 define catlfish::storage(
+      $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}_storage':
+   sunet::docker_run {"${name}_catlfish":
        image    => $image,
        imagetag => $version,
        volumes  => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
        ports    => ["8081:8081"],
-       command  => ["storage"]
+       command  => ["storage ${name}"]
    }
    ufw:allow { "${name}-allow-8081-acl0":
       ip     => '130.242.125.0/24',