summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-04-15 16:15:33 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-04-15 16:15:33 +0200
commita441b737ad5b17203123f26034c846af3dca4100 (patch)
treeccdb7f4a1a689dc5f5c7b7eee48fd4e406af9bb2 /global/overlay/etc/puppet
parent924d3cb5a15eb60e729f477f18a597040d17e9b8 (diff)
Changed ping-check to be run with run-partssunet-ops-2015-04-15-v02
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 88696a4..4249f7f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -764,13 +764,11 @@ node 'sto-tug-kvm2.swamid.se' {
sunet::docker_run {'flog_app':
image => 'docker.sunet.se/flog/flog_app',
volumes => ['/opt/flog/dotenv:/opt/flog/.env','/var/log/flog/:/opt/flog/logs/'],
- pre_start => '/usr/local/bin/ping-check flog_db.docker && run-parts /usr/local/etc/docker.d',
} ->
sunet::docker_run {'flog_nginx':
image => 'docker.sunet.se/flog/nginx',
ports => ['80:80', '443:443'],
volumes => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'],
- pre_start => '/usr/local/bin/ping-check flog_app.docker && run-parts /usr/local/etc/docker.d',
}
}