Added script ping-check and new pre_start statements for flog_app and flog_nginxsunet-ops-2015-04-15-v01

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 c313a0a..88696a4 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -764,11 +764,13 @@ 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'],
+      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',
    }
 }