From e3ca391c5de55239b4af8a688ff419bb13457124 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 13 Jun 2016 21:04:24 +0200 Subject: Rebase for "Improve reliability of upload_cirros" Upstream change "Improve reliability of upload_cirros.rb" [1] allows us to drop the "Increase upload_cirros timeout" patch, and also requires rebasing our direct kernel boot patch. Also squashed in a small context edit for an unrelated patch. [1] https://review.openstack.org/#/c/327792/ Change-Id: I8adc30a74714414fae55bc7b81bc0f69f41735ce Signed-off-by: Alexandru Avadanii --- ...rease-upload_cirros-timeout-for-multi-image.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch (limited to 'patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch') diff --git a/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch b/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch deleted file mode 100644 index 40ac638f..00000000 --- a/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Stanislaw Kardach -Date: Tue, 22 Mar 2016 10:54:32 +0100 -Subject: [PATCH] Increase upload_cirros timeout for multi-image - ---- - deployment/puppet/osnailyfacter/modular/astute/tasks.yaml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml -index a2cb1da..d9d2dcc 100644 ---- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml -+++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml -@@ -19,6 +19,6 @@ - cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb - retries: 3 - interval: 20 -- timeout: 180 -+ timeout: 360 - - - id: upload_nodes_info -- cgit 1.2.3-korg