Volans has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310768

Change subject: Auto-reimage: increase timeout for Icinga command
......................................................................

Auto-reimage: increase timeout for Icinga command

Bug: T143536
Change-Id: I190f0d68ffe7dabb6768bb63f305d654cc6c5f81
---
M modules/salt/files/wmf_auto_reimage.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/310768/1

diff --git a/modules/salt/files/wmf_auto_reimage.py 
b/modules/salt/files/wmf_auto_reimage.py
index b0e1749..ae24830 100644
--- a/modules/salt/files/wmf_auto_reimage.py
+++ b/modules/salt/files/wmf_auto_reimage.py
@@ -538,7 +538,7 @@
     success_hosts = []
 
     for host, result in proxy_command(
-            'icinga_downtime', icinga_host, hosts_commands):
+            'icinga_downtime', icinga_host, hosts_commands, timeout=300):
 
         if result['retcode'] == 0:
             success_hosts.append(host)
@@ -970,7 +970,8 @@
         hosts_status = conftool_depool_hosts(puppetmaster_host, hosts)
         hosts = conftool_ensure_depooled(puppetmaster_host, hosts)
         # Run Puppet on the deployment host to update DSH groups
-        run_puppet([deployment_host])
+        if len(hosts) > 0:
+            run_puppet([deployment_host])
 
     # Start the reimage
     reimage_time = datetime.now()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I190f0d68ffe7dabb6768bb63f305d654cc6c5f81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>

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

Reply via email to