diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-21 22:21:18 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-21 21:26:40 +0000 |
| commit | 7d03950d2685185b93fbad50a23ed6cf7c638f00 (patch) | |
| tree | 2edd165dd1c98d59885653e2539a4511f06b7ba2 /patches/fuel-agent | |
| parent | c59dbece66cc72b12d5000d8f58a34cd6bf817c8 (diff) | |
f-a: bootstrap: /etc/rc.local: force mco start
Temporary workaround for upstream bug:
"Mcollective fails to start in bootstrap of baremetal servers" [1]
This should be reverted as soon as upstream merges a fix.
While at it, add some missing license headers to patches.
[1] https://bugs.launchpad.net/fuel/newton/+bug/1656150
Change-Id: I6d03819bd2df5b8fd9451faedcfd2783847838fa
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8d3f0770c0ea96771550d2cca3eb169039025900)
Diffstat (limited to 'patches/fuel-agent')
| -rw-r--r-- | patches/fuel-agent/0001-TEMP-bootstrap-etc-rc.local-force-mco-start.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/patches/fuel-agent/0001-TEMP-bootstrap-etc-rc.local-force-mco-start.patch b/patches/fuel-agent/0001-TEMP-bootstrap-etc-rc.local-force-mco-start.patch new file mode 100644 index 00000000..ba4c382c --- /dev/null +++ b/patches/fuel-agent/0001-TEMP-bootstrap-etc-rc.local-force-mco-start.patch @@ -0,0 +1,47 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 22 Feb 2017 21:43:48 +0100 +Subject: [PATCH] TEMP: bootstrap: /etc/rc.local: force mco start + +Temporary workaround for upstream bug: +"Mcollective fails to start in bootstrap of baremetal servers" [1] + +This should be reverted as soon as upstream merges a fix. + +[1] https://bugs.launchpad.net/fuel/newton/+bug/1656150 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + contrib/fuel_bootstrap/files/xenial/etc/rc.local | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/contrib/fuel_bootstrap/files/xenial/etc/rc.local b/contrib/fuel_bootstrap/files/xenial/etc/rc.local +index 9712ba7..12262e3 100755 +--- a/contrib/fuel_bootstrap/files/xenial/etc/rc.local ++++ b/contrib/fuel_bootstrap/files/xenial/etc/rc.local +@@ -2,3 +2,18 @@ + + # Perform fuel bootstrap configuration + /usr/bin/fix-configs-on-startup || /bin/true ++ ++# FIXME: Temporary workaround for: ++# https://bugs.launchpad.net/fuel/newton/+bug/1656150 ++set +e ++until false ++do ++ sleep 60 ++ /etc/init.d/mcollective status > /dev/null 2>&1 ++ if [ $? -eq 0 ] ++ then ++ break ++ else ++ /usr/bin/fix-configs-on-startup || /bin/true ++ fi ++done |