Merge "Fix tranport url for rabbitmq"
diff --git a/cinder/controller.sls b/cinder/controller.sls
index 60020e6..9349a34 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -54,7 +54,7 @@
{%- for backend_name, backend in controller.get('backend', {}).iteritems() %}
{%- if backend.engine is defined and backend.engine == 'nfs' %}
-/etc/cinder/nfs_shares:
+/etc/cinder/nfs_shares_{{ backend_name }}:
file.managed:
- source: salt://cinder/files/{{ controller.version }}/nfs_shares
- defaults:
diff --git a/cinder/files/backend/_nfs.conf b/cinder/files/backend/_nfs.conf
index 7c7cc7d..26e8e66 100644
--- a/cinder/files/backend/_nfs.conf
+++ b/cinder/files/backend/_nfs.conf
@@ -7,5 +7,5 @@
nfs_mount_attempts = 3
nfs_mount_options = {{ backend.get('options', None) }}
nfs_mount_point_base = {{ backend.get('path', '/mnt') }}
-nfs_shares_config = /etc/cinder/nfs_shares
+nfs_shares_config = /etc/cinder/nfs_shares_{{ backend_name }}
nfs_sparsed_volumes = True