diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-21 18:21:10 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-21 18:28:24 +0100 |
| commit | 1718b5cd796576a1d7d10cd4b2c4b7488d5a20b0 (patch) | |
| tree | de7f68d1002a25e831bcb4623a18e8a7b87bbddd /patches/fuel-library/upstream-backports | |
| parent | b3ea096a598cacff59722981745d83c2b3cd7a3c (diff) | |
fuel-library: Revert cobbler removal
While at it, remove unrelated patch that was merged upstream.
JIRA: ARMBAND-237
Change-Id: I01889d100e2f8adab34a60389e602d7d48f5b973
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/upstream-backports')
| -rw-r--r-- | patches/fuel-library/upstream-backports/0002-Increase-reboot-task-timeout.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/patches/fuel-library/upstream-backports/0002-Increase-reboot-task-timeout.patch b/patches/fuel-library/upstream-backports/0002-Increase-reboot-task-timeout.patch deleted file mode 100644 index a675fc78..00000000 --- a/patches/fuel-library/upstream-backports/0002-Increase-reboot-task-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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: Stanislaw Bogatkin <sbogatkin@mirantis.com> -Date: Mon, 13 Mar 2017 14:13:34 +0300 -Subject: [PATCH] Increase reboot task timeout - -To avoid broken provision on baremetal servers, increase reboot -task timeout to 15 minutes. - -Change-Id: Ia7b9aa96407dae5819420146f5e1e934031b662c -Closes-Bug: #1671793 ---- - graphs/provision/tasks.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/graphs/provision/tasks.yaml b/graphs/provision/tasks.yaml -index 46f4faa..68716ce 100644 ---- a/graphs/provision/tasks.yaml -+++ b/graphs/provision/tasks.yaml -@@ -105,4 +105,4 @@ - requires: [cobbler_disable_netboot] - required_for: [set_status_provisioned] - parameters: -- timeout: 180 -+ timeout: 900 |