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/frontend.pp b/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
index df1b932..e441083 100644
--- a/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
+++ b/global/overlay/etc/puppet/manifests/catlfish/frontend.pp
@@ -1,10 +1,11 @@
 define catlfish::frontend(
+      $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}_varnish":
@@ -20,12 +21,12 @@ define catlfish::frontend(
       env      => ["BACKEND_PORT=tcp://${name}_varnish.docker:80"],
       ports    => ["443:443"]
    } ->
-   sunet::docker_run {'${name}_frontend':
+   sunet::docker_run {"${name}_catlfish":
        image    => $image,
        imagetag => $version,
        ports    => ["8080:8080","8082:8082"],
        volumes  => ["/usr/local/etc/catlfish:/usr/local/etc/catlfish:ro","${db}:/var/local/db/catlfish"],
-       command  => ["frontend"]
+       command  => ["frontend ${name}"]
    } ->
    ufw::allow { "${name}-allow-http":
       ip   => 'any',