diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 15:06:02 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:16:25 +0000 |
| commit | ca12251eb36ddf1efc4d6bbed37a6e002ae110c2 (patch) | |
| tree | 54758b57f5f1bc42f7707c2706f3eeee11b6a51e /patches/fuel-library/0008-Increase-upload_cirros-timeout-for-multi-image.patch | |
| parent | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (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>
(cherry picked from commit 0f762e556ea7b2393f56ca7fb8e06f66f99880aa)
Change-Id: I24f84e8b100b3f1542f9f51db93ebad9831b9b14
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.patch | 21 |
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 |