diff options
Diffstat (limited to 'patches')
4 files changed, 71 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 diff --git a/patches/fuel-library/0002-Revert-Fix-deletion-graph-no-cobbler-mode.patch b/patches/fuel-library/0002-Revert-Fix-deletion-graph-no-cobbler-mode.patch index bf180cdb..1980448c 100644 --- a/patches/fuel-library/0002-Revert-Fix-deletion-graph-no-cobbler-mode.patch +++ b/patches/fuel-library/0002-Revert-Fix-deletion-graph-no-cobbler-mode.patch @@ -1,3 +1,11 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Tue, 21 Mar 2017 18:01:23 +0100 Subject: [PATCH 1/2] Revert "Fix deletion graph (no cobbler mode)" diff --git a/patches/fuel-library/0003-Revert-Remove-cobbler-and-use-dhcpd-named-and-tftp.patch b/patches/fuel-library/0003-Revert-Remove-cobbler-and-use-dhcpd-named-and-tftp.patch index b2493e12..d5ed03a5 100644 --- a/patches/fuel-library/0003-Revert-Remove-cobbler-and-use-dhcpd-named-and-tftp.patch +++ b/patches/fuel-library/0003-Revert-Remove-cobbler-and-use-dhcpd-named-and-tftp.patch @@ -1,3 +1,11 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: Tue, 21 Mar 2017 18:01:31 +0100 Subject: [PATCH 2/2] Revert "Remove cobbler and use dhcpd named and tftp" diff --git a/patches/network-checker/0001-Fixed-typo-in-net-check.patch b/patches/network-checker/0001-Fixed-typo-in-net-check.patch index d1fa45a2..1546dde5 100644 --- a/patches/network-checker/0001-Fixed-typo-in-net-check.patch +++ b/patches/network-checker/0001-Fixed-typo-in-net-check.patch @@ -1,3 +1,11 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: chko <hkominos> Date: Tue, 21 Mar 2017 14:51:22 +0100 Subject: [PATCH] Fixed typo in net-check Closes-Bug:#1674724 |