From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 11 Apr 2015 04:56:32 +0000 (+0000)
Subject: Merge "VMware: Fix missing target resource pool"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=62fb81e7660127107ecd7e121e0eb668373bef85;p=openstack-build%2Fcinder-build.git

Merge "VMware: Fix missing target resource pool"
---

62fb81e7660127107ecd7e121e0eb668373bef85
diff --cc cinder/volume/drivers/vmware/vmdk.py
index 338765f84,49c2c9f8c..c8c2eab3f
--- a/cinder/volume/drivers/vmware/vmdk.py
+++ b/cinder/volume/drivers/vmware/vmdk.py
@@@ -1535,10 -1502,10 +1536,10 @@@ class VMwareEsxVmdkDriver(driver.Volume
                      new_backing = self.volumeops.clone_backing(
                          volume['name'], backing, None,
                          volumeops.FULL_CLONE_TYPE, datastore, new_disk_type,
-                         host)
+                         host, rp)
                      self._delete_temp_backing(backing)
                      backing = new_backing
 -                except error_util.VimException:
 +                except exceptions.VimException:
                      with excutils.save_and_reraise_exception():
                          LOG.exception(_LE("Error occurred while cloning "
                                            "backing:"