summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-23 15:15:37 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-23 15:15:37 +0200
commitb0e4f70768f40f01f0718c108c8f2ef0683582fd (patch)
treef282b10af50d8dd58cf875e3fb465d39f0cb5b6c
parent33a2c27556ccf0e13982f65ae0af5cfebc4d5f28 (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp10
1 files changed, 6 insertions, 4 deletions
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']
}
}