summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-23 14:57:13 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-23 14:57:13 +0200
commit33a2c27556ccf0e13982f65ae0af5cfebc4d5f28 (patch)
tree1472a02fb3be8b2116ea4cea4c7b804d447b218e
parent2dd59facc78e6464ae4f31940f2f12968ea6ffc6 (diff)
include dockerhostsunet-ops-2015-09-23-v16
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 1acdbc7..fe95f0d 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -166,12 +166,13 @@ node 'docker.sunet.se' {
}
define pyff($dir) {
+ ensure_resource('class', 'sunet::dockerhost', {})
sunet::docker_run {'pyff_${name}':
image => 'docker.samlbits.net/pyff',
volumes => ["${dir}:${dir}"],
env => ['DATADIR=${dir}','LOGLEVEL=INFO']
}
- docker::run {'varnish_${name}':
+ sunet::docker_run {'varnish_${name}':
image => 'docker.samlbits.net/varnish',
env => ['BACKEND_PORT=tcp://pyff.varnish:80'],
ports => ['80:80']