summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-20 04:04:59 +0000
committerGerrit Code Review <review@openstack.org>2014-09-20 04:04:59 +0000
commit4e7f510235a79cf04a8a6ef5455d17267ea058d3 (patch)
treed0fe90d9e5a12f01735016eadf0ec125965c55e6
parent423741c46cc21499409c0b3e91131fc456e76885 (diff)
parentbdce4e7e789954bd5f1da6a1f238aa015c691d50 (diff)
downloadcinder-stable/havana.tar.gz
Merge "Don't clear _mounted_shares list in remoteFS while updating" into stable/havanahavana-eol2013.2.4stable/havana
-rw-r--r--cinder/volume/drivers/nfs.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cinder/volume/drivers/nfs.py b/cinder/volume/drivers/nfs.py
index 19347738c..82ae373cc 100644
--- a/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@ -145,7 +145,7 @@ class RemoteFsDriver(driver.VolumeDriver):
"""Look for remote shares in the flags and tries to mount them
locally.
"""
- self._mounted_shares = []
+ mounted_shares = []
self._load_shares_config(getattr(self.configuration,
self.driver_prefix +
@@ -154,10 +154,12 @@ class RemoteFsDriver(driver.VolumeDriver):
for share in self.shares.keys():
try:
self._ensure_share_mounted(share)
- self._mounted_shares.append(share)
+ mounted_shares.append(share)
except Exception as exc:
LOG.warning(_('Exception during mounting %s') % (exc,))
+ self._mounted_shares = mounted_shares
+
LOG.debug('Available shares %s' % str(self._mounted_shares))
def create_cloned_volume(self, volume, src_vref):