diff options
| author | Johan Lundberg <lundberg@nordu.net> | 2015-04-17 14:25:53 +0200 |
|---|---|---|
| committer | Johan Lundberg <lundberg@nordu.net> | 2015-04-17 14:25:53 +0200 |
| commit | cd87a440cfef2e18993c25c5aa3b6064ba6c33cb (patch) | |
| tree | 8e7f256494f1bd053e5129591ace54e5d49d1055 /global | |
| parent | fd1987317642b920286c3088540c8b00cae3bd88 (diff) | |
| parent | 120010e02911902aab51db07f60fcfb554f96d62 (diff) | |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-17-v21
Diffstat (limited to 'global')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 7 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp | 3 |
2 files changed, 8 insertions, 2 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"], } } 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}" ] |