Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-17-v21

1 files changed, 6 insertions, 1 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 02726d5..a9603a5 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -838,10 +838,15 @@ 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":
+      image    => "docker.sunet.se/varnish-auto",
+      imagetag => "latest",
+      env      => ["ETCD_URL=http://etcd_sunetweb.docker:4001"],
+      ports    => ["80:80"],
    }
 }