From b0e4f70768f40f01f0718c108c8f2ef0683582fd Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 23 Sep 2015 15:15:37 +0200 Subject: pull from sunet --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'global/overlay/etc') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index fe95f0d..3d71620 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -168,14 +168,16 @@ node 'docker.sunet.se' { define pyff($dir) { ensure_resource('class', 'sunet::dockerhost', {}) sunet::docker_run {'pyff_${name}': - image => 'docker.samlbits.net/pyff', + image => 'docker.sunet.se/pyff', + imagetag => 'latest', volumes => ["${dir}:${dir}"], env => ['DATADIR=${dir}','LOGLEVEL=INFO'] } sunet::docker_run {'varnish_${name}': - image => 'docker.samlbits.net/varnish', - env => ['BACKEND_PORT=tcp://pyff.varnish:80'], - ports => ['80:80'] + image => 'docker.sunet.se/varnish', + imagetag => 'latest', + env => ['BACKEND_PORT=tcp://pyff.varnish:80'], + ports => ['80:80'] } } -- cgit v1.1