summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-03-29 15:06:02 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-03-29 14:16:43 +0000
commit0f762e556ea7b2393f56ca7fb8e06f66f99880aa (patch)
treeb29dfebef5de0a545f190d28f061cedf813195fe /patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch
parentccf57699bbff183ef45fd4a4e94df094ca69ee87 (diff)
Clean up and fix Libvirt and Ceph
[ Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> ] * Fix upload_cirros timeout * Workaround for default video device in nova * Fix syntax and increase TestVM's RAM requirements [ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ] * Cleanup: Obsolete SEPARATE_IMAGES. * Nova libvirt drv: arm64: Update console default. * fuel{,-main}: Cleanup obsolete patches. * nova: Fix inject for direct boot with part table. See https://bugs.launchpad.net/nova/+bug/1290455 for full bug description. For now, we detect direct kernel boot with a partition table inside disk image by passing target_partition when root kernel arg points to a partition (instead of the whole disk). * Drop obsolete/done TODO entries. * Nova: Fix os cmd line parsing for list case. * ceph: Fix obsolete XFS mount param. * Fix out-of-order embedded patch hunks. Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch')
-rw-r--r--patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch21
1 files changed, 21 insertions, 0 deletions
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
new file mode 100644
index 00000000..7f240c8e
--- /dev/null
+++ b/patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch
@@ -0,0 +1,21 @@
+From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
+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,7 +19,7 @@
+ cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb
+ retries: 3
+ interval: 20
+- timeout: 180
++ timeout: 360
+
+ - id: upload_nodes_info
+ type: upload_file