summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-17 13:16:42 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-17 13:16:42 +0200
commite791167cde0cf9d5bfc79f5f6a39b754b75a8871 (patch)
tree99cf06d31627f85209bc664bd49b2fab594ac5f7 /global
parentc30a0dfc551f5082806b08a1225b0800c26f51be (diff)
varnish autoconfsunet-ops-2015-04-17-v19
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index eabf8d6..52dee39 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -839,13 +839,11 @@ class webcommon {
class webfrontend {
class { 'webcommon': }
docker::image {'docker.sunet.se/pound': }
- docker::image {'docker.sunet.se/varnish': }
sunet::etcd_node {'sunetweb':
disco_url => 'https://discovery.etcd.io/877f25988ea1e8bb8c9a49f2ad5f5f6a',
proxy => true
} ->
sunet::docker_run{"varnish":
- depends =>
image => "docker.sunet.se/varnish-auto",
imagetag => "latest",
links => ["etcd_sunetweb:etcd"],