Modify default prefix for solidfire account

The SolidFire driver creates a unique account at volume
creation composed of <cinderhost-tenantID>.This is fine
until one tries to implement HA Cinder or moves their
Cinder node to another machine.

This patch changes the default setting to be an empty string
(ie no prefix), but still allows backward compatability by setting
the config option to 'hostname'.

DocImpact: Changes default for account-prefix, for backwards compatability
use the non-default 'hostname'

Change-Id: I500ea14c1b4e9e3efd51c035cc3c4e6232da9dd6
Closes-Bug: 1265208

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index a0e87d443b6a6724a406fea3d9727f06e0905655..3eff78221041134408b47c08d1f8703d21ab0a0a 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -47,8 +47,10 @@ sf_opts = [
 
     cfg.StrOpt('sf_account_prefix',
                default=None,
-               help='Create SolidFire accounts with this prefix. Uses current '
-                    'hostname if unset (default).'),
+               help='Create SolidFire accounts with this prefix. Any string '
+                    'can be used here, but the string \"hostname\" is special '
+                    'and will create a prefix using the cinder node hostsname '
+                    '(previous default behavior).  The default is NO prefix.'),
 
     cfg.IntOpt('sf_api_port',
                default=443,
@@ -224,7 +226,9 @@ class SolidFireDriver(SanISCSIDriver):
 
     def _get_sf_account_name(self, project_id):
         """Build the SolidFire account name to use."""
-        prefix = self.configuration.sf_account_prefix or socket.gethostname()
+        prefix = self.configuration.sf_account_prefix or ''
+        if prefix == 'hostname':
+            prefix = socket.gethostname()
         return '%s%s%s' % (prefix, '-' if prefix else '', project_id)
 
     def _get_sfaccount(self, project_id):

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index b0cdb7213c18095142fb8321cbf15b8a963f4f2b..36ed10a368761020383620de4ecdb2041e5561bf 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -1620,8 +1620,10 @@
 # Allow tenants to specify QOS on create (boolean value)
 #sf_allow_tenant_qos=false
 
-# Create SolidFire accounts with this prefix. Uses current
-# hostname if unset (default). (string value)
+# Create SolidFire accounts with this prefix. Any string can
+# be used here, but the string "hostname" is special and will
+# create a prefix using the cinder node hostsname (previous
+# default behavior).  The default is NO prefix. (string value)
 #sf_account_prefix=<None>
 
 # SolidFire API port. Useful if the device api is behind a