Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383316 )
Change subject: Provide a reboot wrapper for Cumin clients
......................................................................
Provide a reboot wrapper for Cumin clients
With Salt a host could simply be rebooted with "salt foo* cmd.run 'reboot'",
but since Cumin is relying on SSH as a transport, running 'reboot' via Cumin
leaves the connection hanging (and Cumin failing on that host).
This small wrapper detaches the reboot command to avoid this.
Added to the base::debdeploy class; while not part of debdeploy it's still
somewhat related to software/system updates and at some point debdeploy
support for kernel reboots will also use this.
Change-Id: If5732c7754d1b4811c86e48cf3e1fc78a8d77d42
---
A modules/base/files/reboot-host
M modules/base/manifests/debdeploy.pp
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/base/files/reboot-host b/modules/base/files/reboot-host
new file mode 100644
index 0000000..9997854
--- /dev/null
+++ b/modules/base/files/reboot-host
@@ -0,0 +1,2 @@
+#!/bin/bash
+nohup reboot &> /dev/null & exit
diff --git a/modules/base/manifests/debdeploy.pp
b/modules/base/manifests/debdeploy.pp
index 55022de..975d53b 100644
--- a/modules/base/manifests/debdeploy.pp
+++ b/modules/base/manifests/debdeploy.pp
@@ -13,5 +13,13 @@
mode => '0555',
}
+ file { '/usr/local/sbin/reboot-host':
+ ensure => 'present',
+ owner => 'root',
+ group => 'root',
+ mode => '0550',
+ source => 'puppet:///modules/base/reboot-host',
+ }
+
require_package('debdeploy-client', 'python-dateutil')
}
--
To view, visit https://gerrit.wikimedia.org/r/383316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5732c7754d1b4811c86e48cf3e1fc78a8d77d42
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
