Merge "Create RemoteFSSnapDriver class"

diff --cc cinder/exception.py
Simple merge

diff --cc cinder/volume/drivers/glusterfs.py
Simple merge

diff --cc cinder/volume/drivers/ibm/ibmnas.py
index bf69d299bc1e2a24d6951a51473cc4c3ecf35bad,6647ea2b017caae6c6bdb298a85459838aee7ad7..c9be13b71b50ceebb4468a484eb528ef34090629
--- 1/cinder/volume/drivers/ibm/ibmnas.py
--- 2/cinder/volume/drivers/ibm/ibmnas.py
+++ b/cinder/volume/drivers/ibm/ibmnas.py
@@@ -42,25 -40,13 +42,25 @@@ from cinder.openstack.common import pro
  from cinder.openstack.common import units
  from cinder import utils
  from cinder.volume.drivers import nfs
- from cinder.volume.drivers.nfs import nas_opts
+ from cinder.volume.drivers.remotefs import nas_opts
  from cinder.volume.drivers.san import san
  
 -VERSION = '1.0.0'
 +VERSION = '1.1.0'
  
  LOG = logging.getLogger(__name__)
 +
 +platform_opts = [
 +    cfg.StrOpt('ibmnas_platform_type',
 +               default='v7ku',
 +               help=('IBMNAS platform type to be used as backend storage; '
 +                     'valid values are - '
 +                     'v7ku : for using IBM Storwize V7000 Unified, '
 +                     'sonas : for using IBM Scale Out NAS, '
 +                     'gpfs-nas : for using NFS based IBM GPFS deployments.')),
 +]
 +
  CONF = cfg.CONF
 +CONF.register_opts(platform_opts)
  
  
  class IBMNAS_NFSDriver(nfs.NfsDriver, san.SanDriver):

diff --cc cinder/volume/drivers/nfs.py
index 123b0e23f4fb7acc170c49b355447cc2d945aa1a,d42ed83dca34f103db23b16dffe20a150574f971..54b78c512f04a705dfe4a49124cbe1b7d37b661e
--- 1/cinder/volume/drivers/nfs.py
--- 2/cinder/volume/drivers/nfs.py
+++ b/cinder/volume/drivers/nfs.py
@@@ -18,11 -18,10 +18,10 @@@ import o
  
  from oslo.config import cfg
  
- from cinder.brick.remotefs import remotefs
+ from cinder.brick.remotefs import remotefs as remotefs_brick
  from cinder import exception
 +from cinder.i18n import _
  from cinder.image import image_utils
 -from cinder.openstack.common.gettextutils import _
  from cinder.openstack.common import log as logging
  from cinder.openstack.common import processutils as putils
  from cinder.openstack.common import units

diff --cc etc/cinder/cinder.conf.sample
Simple merge