From d284dcced21429aa414f21b4f5e67bdebc651971 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 26 May 2015 13:16:49 +0200 Subject: known roots, nw config --- global/overlay/etc/puppet/manifests/catlfish/storage.pp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'global/overlay/etc/puppet/manifests/catlfish/storage.pp') 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', -- cgit v1.1