Improve provider_location cleanup code for RBD.

The RBD driver does not make use of the 'provider_location' field
but the current cleanup code assumes it does.  Ensure the field
is in use before testing whether or not it needs fixing.

Fixes bug 1083818.

Change-Id: Id6ff85101f85e70575ba244c2df7aca0196cf224
(cherry picked from commit d030c5b10e9e8d73d967562259e7db6146347108)

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index d64014d5fd3556e8f0c3002bdd633c65845a138c..b3a4c97b48fc9a52864bdd2d49b256ad9fc7421c 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -312,7 +312,8 @@ class VolumeManager(manager.SchedulerDependentManager):
 
         # Check for https://bugs.launchpad.net/cinder/+bug/1065702
         volume_ref = self.db.volume_get(context, volume_id)
-        if volume_ref['name'] not in volume_ref['provider_location']:
+        if (volume_ref['provider_location'] and
+            volume_ref['name'] not in volume_ref['provider_location']):
             self.driver.ensure_export(context, volume_ref)
 
     def _copy_image_to_volume(self, context, volume, image_id):