Merge "[VMware] inital commit"
diff --git a/.travis.yml b/.travis.yml
index 90fe8b5..cec7bcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+language: python
+python:
+- "2.7.13"
sudo: required
services:
- docker
diff --git a/README.rst b/README.rst
index 2174fb1..6f74af9 100644
--- a/README.rst
+++ b/README.rst
@@ -563,6 +563,8 @@
sf_emulate_512: false
sf_api_port: 14443
host: ctl01
+ #for compatibility with old versions
+ sf_account_prefix: PREFIX
Cinder setup with Block Device driver
diff --git a/cinder/files/backend/_solidfire.conf b/cinder/files/backend/_solidfire.conf
index 5a76c70..d954121 100644
--- a/cinder/files/backend/_solidfire.conf
+++ b/cinder/files/backend/_solidfire.conf
@@ -14,3 +14,6 @@
sf_api_port = {{ backend.get('sf_api_port', 443) }}
{%- endif %}
volume_driver=cinder.volume.drivers.solidfire.SolidFireDriver
+{%- if backend.sf_account_prefix is defined %}
+sf_account_prefix = {{ backend.sf_account_prefix }}
+{%- endif %}