From 2741c6e75c660727177b9d32d5cf29c60b40eb25 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 13 May 2016 19:37:20 +0200 Subject: Rebase: p/fuel-library: Update after 96da5b4a. Refresh patches after: "Move openstack specific tasks to their own folder structure" NOTE: The qemu-kvm change patch (0003-Make-qemu-kvm-architecture-aware.patch) only affects RedHat systems, so it is optional, at least for the current stage. [1] https://github.com/openstack/fuel-library/commit/ 96da5b4a1eb82a76fb416d93f5249dc32e2499f2 Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b --- .../0008-Increase-upload_cirros-timeout-for-multi-image.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (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 index 7f240c8e..40ac638f 100644 --- 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 @@ -10,7 +10,7 @@ diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deploym index a2cb1da..d9d2dcc 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml +++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml -@@ -19,7 +19,7 @@ +@@ -19,6 +19,6 @@ cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb retries: 3 interval: 20 @@ -18,4 +18,3 @@ index a2cb1da..d9d2dcc 100644 + timeout: 360 - id: upload_nodes_info - type: upload_file -- cgit 1.2.3-korg