From f5e307d669f27759dbeaa54d8c49785a64f7e5c5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 11:12:45 +0200 Subject: service name --- global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp index 196b7fe..d9eeae4 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp @@ -17,7 +17,8 @@ $myqsl_version = "5.7") imagetag => $wordpress_version, volumes => ["/data/${name}/html:/var/www/html"], ports => ["8080:80"], - env => [ "WORDPRESS_DB_HOST=${db_hostname}", + env => [ "SERVICE_NAME=${name}", + "WORDPRESS_DB_HOST=${db_hostname}", "WORDPRESS_DB_USER=${name}", "WORDPRESS_DB_NAME=${name}", "WORDPRESS_DB_PASSWORD=${pwd}" ] -- cgit v1.1 From c30a0dfc551f5082806b08a1225b0800c26f51be Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 13:15:09 +0200 Subject: varnish autoconf --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 8ab4edf..eabf8d6 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -843,6 +843,13 @@ class webfrontend { 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"], + ports => ["80:80"], } } -- cgit v1.1 From e791167cde0cf9d5bfc79f5f6a39b754b75a8871 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 13:16:42 +0200 Subject: varnish autoconf --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 -- 1 file changed, 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"], -- cgit v1.1 From 120010e02911902aab51db07f60fcfb554f96d62 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 13:23:25 +0200 Subject: my version has ETCD_URL --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 52dee39..c5ba195 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -846,7 +846,7 @@ class webfrontend { sunet::docker_run{"varnish": image => "docker.sunet.se/varnish-auto", imagetag => "latest", - links => ["etcd_sunetweb:etcd"], + env => ["ETCD_URL=http://etcd_sunetweb.docker:4001"], ports => ["80:80"], } } -- cgit v1.1