Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370665 )

Change subject: nova-fullstack: adjust timeouts
......................................................................

nova-fullstack: adjust timeouts

Previously I'd been increasing the ssh timeout... closer inspection
of logs and code suggest that it's actually the puppet-timeout
that we were hitting.

So, this patch makes puppet-timeout configurable, and increases
it a bunch.  At the same time I'm decreasing the other
timeouts because I think they were excessive for no good reason.

Bug: T165555
Change-Id: Ibc78ea8206fd00853671eaa149251c17e73ce667
---
M modules/openstack/manifests/nova/fullstack.pp
M modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/370665/1

diff --git a/modules/openstack/manifests/nova/fullstack.pp 
b/modules/openstack/manifests/nova/fullstack.pp
index 1712f4c..dabb925 100644
--- a/modules/openstack/manifests/nova/fullstack.pp
+++ b/modules/openstack/manifests/nova/fullstack.pp
@@ -8,8 +8,9 @@
     $password,
     $interval = 300,
     $max_pool = 7,
-    $creation_timeout = 1200,
-    $ssh_timeout = 1200,
+    $creation_timeout = 600,
+    $ssh_timeout = 600,
+    $puppet_timeout = 600,
     ) {
 
     group { 'osstackcanary':
diff --git a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb 
b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
index b6344ee..f5b787b 100644
--- a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
+++ b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
@@ -20,6 +20,7 @@
     export OS_PASSWORD="<%= @password %>"
     /usr/local/sbin/nova-fullstack \
                                        --ssh-timeout <%= @ssh_timeout %> \
+                                       --puppet-timeout <%= @puppet_timeout %> 
\
                                        --creation-timeout <%= 
@creation_timeout %> \
                                        --interval <%= @interval %> \
                                        --max-pool <%= @max_pool %>  \

-- 
To view, visit https://gerrit.wikimedia.org/r/370665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc78ea8206fd00853671eaa149251c17e73ce667
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to