From: Jeegn Chen <jeegn.chen@emc.com>
Date: Tue, 1 Jul 2014 03:31:19 +0000 (+0800)
Subject: Add optional_args to fix Volume Import failure
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8d6e9cf0fc564942dce14ce8f133c5d0ee06c4f4;p=openstack-build%2Fcinder-build.git

Add optional_args to fix Volume Import failure

Commit 971a63bd9cf675a00bce1244ec101577b5c17cac added a new
parameter 'optional_args' to execute method of QuotaReserveTask
and QuotaCommitTask. So the new parameter should be needed where
those Tasks are used. This changed volume create task flow to
provide the new parameter. We need the samiliar change to get_flow
method in cinder/volume/flows/manager/manage_existing.py

Trigger EMC VNX CI

Change-Id: Ifed7bd146eec82ba35c2b2c19e9bacd2259ae3ed
Closes-Bug: #1334086
---

diff --git a/cinder/volume/flows/manager/manage_existing.py b/cinder/volume/flows/manager/manage_existing.py
index 5ee2860c4..2de879b68 100644
--- a/cinder/volume/flows/manager/manage_existing.py
+++ b/cinder/volume/flows/manager/manage_existing.py
@@ -102,7 +102,8 @@ def get_flow(context, db, driver, host, volume_id, ref):
     create_what = {
         'context': context,
         'volume_id': volume_id,
-        'manage_existing_ref': ref
+        'manage_existing_ref': ref,
+        'optional_args': {'is_quota_committed': False}
     }
 
     volume_flow.add(create_mgr.ExtractVolumeRefTask(db, host),