summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-02-03 17:47:02 +0100
committervarac <varacanero@zeromail.org>2013-02-03 17:47:02 +0100
commit3b32d321b131723bbd830945ef4176d7d37b6e3c (patch)
treee2d92d7efb4306f644cd7c20442c0a4f8fdffa0c
parent0ab18bc91fa84df2c457ca1ea43ebebc65e5bb2b (diff)
Increase Exec[bundler_update] timeout
Exec[bundler_update] can take a really long time, increasing timeout from 300s (default) to 600s fixes Increase command timeout for Exec[bundler_update] (Feature #1643)
-rw-r--r--puppet/modules/site_ca_daemon/manifests/init.pp1
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp
index 86e186bb..8ba9c506 100644
--- a/puppet/modules/site_ca_daemon/manifests/init.pp
+++ b/puppet/modules/site_ca_daemon/manifests/init.pp
@@ -82,6 +82,7 @@ class site_ca_daemon {
cwd => '/srv/leap_ca_daemon',
command => '/bin/bash -c "/usr/bin/bundle check || /usr/bin/bundle install"',
unless => '/usr/bin/bundle check',
+ timeout => 600,
require => [ Class['bundler::install'], Vcsrepo['/srv/leap_ca_daemon'] ];
}
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index d59cebba..24c258dc 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -54,6 +54,7 @@ class site_webapp {
cwd => '/srv/leap-webapp',
command => '/bin/bash -c "/usr/bin/bundle check || /usr/bin/bundle install"',
unless => '/usr/bin/bundle check',
+ timeout => 600,
require => [ Class['bundler::install'], Vcsrepo['/srv/leap-webapp'] ];
}