Merge "Make the SolidFire driver api port configurable."

cinder/volume/drivers/solidfire.py

@@ -47,7 +47,12 @@
 
     cfg.StrOpt('sf_account_prefix',
                default=socket.gethostname(),
-               help='Create SolidFire accounts with this prefix'), ]
+               help='Create SolidFire accounts with this prefix'),
+
+    cfg.IntOpt('sf_api_port',
+               default=443,
+               help='SolidFire API port. Useful if the device api is behind '
+                    'a proxy on a different port.'), ]
 
 
 CONF = cfg.CONF
@@ -105,8 +110,7 @@ def _issue_api_request(self, method_name, params, version='1.0'):
                                    'xMaxSnapshotsPerNodeExceeded',
                                    'xMaxClonesPerNodeExceeded']
         host = self.configuration.san_ip
-        # For now 443 is the only port our server accepts requests on
-        port = 443
+        port = self.configuration.sf_api_port
 
         cluster_admin = self.configuration.san_login
         cluster_password = self.configuration.san_password

etc/cinder/cinder.conf.sample

@@ -1266,12 +1266,19 @@
 # Options defined in cinder.volume.drivers.solidfire
 #
 
-# Set 512 byte emulation on volume creation;  (boolean value)
+# Set 512 byte emulation on volume creation (boolean value)
 #sf_emulate_512=true
 
 # Allow tenants to specify QOS on create (boolean value)
 #sf_allow_tenant_qos=false
 
+# Create solidfire accounts with this prefix. Defaults to current
+# hostname (string value)
+#sf_account_prefix=
+
+# Solidfire API port. Useful if the device is behind a proxy (integer value)
+#sf_api_port=443
+
 
 #
 # Options defined in cinder.volume.drivers.storwize_svc