summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet/manifests
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-18 09:59:55 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-18 09:59:55 +0200
commit72285b2c4915a1f0ff7d1d3888b341aec97997c6 (patch)
treeab6e334201e0ec7e04ec5d2a0983eb5de3d42eab /global/overlay/etc/puppet/manifests
parente00dc9426888f85d772724b5a13b2f84d4c7332c (diff)
webcommon calls dockerhostsunet-ops-2015-09-18-v03
Diffstat (limited to 'global/overlay/etc/puppet/manifests')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 3a19aac..696fdb6 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -824,7 +824,8 @@ class quantis {
}
class webcommon {
- file {"/data": ensure => directory }
+ class {'sunet::dockerhost': } ->
+ file {"/data": ensure => directory } ->
sunet::docker_run{"web_registrator":
image => "gliderlabs/registrator",
imagetag => "latest",
@@ -878,7 +879,6 @@ class webbackend {
}
node 'web-a1.sunet.se' {
- ensure_resource(file,'/data',{ ensure => directory })
sunet::wordpress {'www_sunet_se':
wordpress_image => 'docker.sunet.se/shib-wordpress',
wordpress_version => 'latest',