summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-15 11:41:50 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-15 11:41:50 +0200
commit7f25aa259c22f4d236850bf2156a3730cfa35968 (patch)
tree7991482199e878c636055ab4c549fbd920f83031
parent6ece1cf03a4cfdffa6b53d3d663bcdaf081dc6b1 (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp8
1 files changed, 5 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 0b1012c..adf88ea 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -117,20 +117,22 @@ node 'reep.tid.isoc.org' {
node 'datasets.sunet.se' {
file {'/opt/lobo2-redis-data':
ensure => 'directory',
- }
+ } ->
file {'/etc/ssl':
ensure => 'directory',
- }
+ } ->
sunet::docker_run {'redis':
image => 'dockerfile/redis',
+ imagetag => 'latest',
volumes => ['/opt/lobo2-redis-data:/data','/var/log:/var/log'],
} ->
sunet::docker_run {'datasets':
image => 'docker.sunet.se/datasets',
+ imagetag => 'latest',
volumes => ['/etc/ssl:/etc/ssl','/var/log:/var/log'],
ports => ['80:80','443:443'],
env => ["REDIS_PORT=tcp://redis.docker:6379",'BASE_URL=https://datasets.sunet.se'],
- start_on => 'docker-redis',
+ start_on => 'docker-redis'
}
}