diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-09-18 09:59:55 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-09-18 09:59:55 +0200 |
| commit | 72285b2c4915a1f0ff7d1d3888b341aec97997c6 (patch) | |
| tree | ab6e334201e0ec7e04ec5d2a0983eb5de3d42eab | |
| parent | e00dc9426888f85d772724b5a13b2f84d4c7332c (diff) | |
webcommon calls dockerhostsunet-ops-2015-09-18-v03
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-rules.yaml | 3 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -1,3 +1,5 @@ +all: db + cosmos: fab all cosmos diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 1425dc4..0172675 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -16,7 +16,6 @@ registry.swamid.se: dockerhost: webserver: datasets.sunet.se: - sunet::dockerhost: webserver: docker.sunet.se: dockerhost: @@ -41,7 +40,7 @@ md-master.reep.refeds.org: www2.eduid.se: dockerhost: '^web-.+\.sunet\.se$': - sunet::dockerhost: + webcommon: '^web-a[0-9]+\.sunet\.se$': webappserver: '^web-f[0-9]+\.sunet\.se$': 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', |