diff --git a/cinder/files/newton/cinder.conf.controller.Debian b/cinder/files/newton/cinder.conf.controller.Debian
index a0c4c53..6e85f3d 100644
--- a/cinder/files/newton/cinder.conf.controller.Debian
+++ b/cinder/files/newton/cinder.conf.controller.Debian
@@ -28,10 +28,19 @@
 
 osapi_volume_listen={{ controller.osapi.host }}
 
+glance_api_servers = http://{{ controller.glance.host }}:{{ controller.glance.port }}
+
 glance_host={{ controller.glance.host }}
 glance_port={{ controller.glance.port }}
 glance_api_version=2
 
+enable_v3_api = True
+
+os_privileged_user_name={{ controller.identity.user }}
+os_privileged_user_password={{ controller.identity.password }}
+os_privileged_user_tenant={{ controller.identity.tenant }}
+os_privileged_user_auth_url=http://{{ controller.identity.host }}:5000/v3/
+
 volume_backend_name=DEFAULT
 
 {%- if controller.backend is defined %}
@@ -78,10 +87,20 @@
 lock_path=/var/lock/cinder
 
 nova_catalog_admin_info = compute:nova:adminURL
-nova_catalog_info = compute:nova:{{ server.identity.get('endpoint_type', 'publicURL') }}
+nova_catalog_info = compute:nova:{{ controller.identity.get('endpoint_type', 'publicURL') }}
 
 osapi_volume_extension = cinder.api.contrib.standard_extensions
 
+{%- if controller.message_queue.members is defined %}
+transport_url = rabbit://{% for member in controller.message_queue.members -%}
+                             {{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ member.get('port', 5672) }}
+                             {%- if not loop.last -%},{%- endif -%}
+                             /{{ controller.message_queue.virtual_host }}
+                         {%- endfor -%}
+{%- else %}
+transport_url = rabbit://{{ controller.message_queue.user }}:{{ controller.message_queue.password }}@{{ controller.message_queue.host }}:{{ member.get('port', 5672) }}/{{ controller.message_queue.virtual_host }}
+{%- endif %}
+
 [oslo_messaging_notifications]
 {%- if controller.notification is mapping %}
 driver = {{ controller.notification.get('driver', 'messagingv2') }}
@@ -96,21 +115,11 @@
 
 lock_path=/var/lock/cinder
 
-[oslo_messaging_rabbit]
-{%- if controller.message_queue.members is defined %}
-rabbit_hosts = {% for member in controller.message_queue.members -%}
-                   {{ member.host }}:{{ member.get('port', 5672) }}
-                   {%- if not loop.last -%},{%- endif -%}
-               {%- endfor -%}
-{%- else %}
-rabbit_host = {{ controller.message_queue.host }}
-rabbit_port = {{ controller.message_queue.port }}
-{%- endif %}
+[oslo_middleware]
 
-rabbit_userid = {{ controller.message_queue.user }}
-rabbit_password = {{ controller.message_queue.password }}
-rabbit_virtual_host = {{ controller.message_queue.virtual_host }}
-kombu_reconnect_delay=5.0
+enable_proxy_headers_parsing = True
+
+[oslo_messaging_rabbit]
 
 [keystone_authtoken]
 signing_dir=/tmp/keystone-signing-cinder
@@ -130,13 +139,17 @@
 {%- if controller.cache is defined %}
 memcached_servers={%- for member in controller.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
 {%- endif %}
+auth_version = v3
+
+[barbican]
+auth_endpoint=http://{{ controller.identity.host }}:5000
 
 [database]
 idle_timeout=3600
 max_pool_size=30
 max_retries=-1
 max_overflow=40
-connection = {{ controller.database.engine }}+pymysql://{{ controller.database.user }}:{{ controller.database.password }}@{{ controller.database.host }}/{{ controller.database.name }}
+connection = {{ controller.database.engine }}+pymysql://{{ controller.database.user }}:{{ controller.database.password }}@{{ controller.database.host }}/{{ controller.database.name }}?charset=utf8&read_timeout=60
 
 {%- if controller.backend is defined %}
 
diff --git a/cinder/files/newton/cinder.conf.volume.Debian b/cinder/files/newton/cinder.conf.volume.Debian
index a8d4f7b..3ee6113 100644
--- a/cinder/files/newton/cinder.conf.volume.Debian
+++ b/cinder/files/newton/cinder.conf.volume.Debian
@@ -28,10 +28,17 @@
 
 osapi_volume_listen={{ volume.osapi.host }}
 
+glance_api_servers = http://{{ volume.glance.host }}:{{ volume.glance.port }}
+
 glance_host={{ volume.glance.host }}
 glance_port={{ volume.glance.port }}
 glance_api_version=2
 
+os_privileged_user_name={{ volume.identity.user }}
+os_privileged_user_password={{ volume.identity.password }}
+os_privileged_user_tenant={{ volume.identity.tenant }}
+os_privileged_user_auth_url=http://{{ volume.identity.host }}:5000/v3/
+
 volume_backend_name=DEFAULT
 
 {%- if volume.backend is defined %}
@@ -76,7 +83,17 @@
 verbose=True
 
 nova_catalog_admin_info = compute:nova:adminURL
-nova_catalog_info = compute:nova:{{ server.identity.get('endpoint_type', 'publicURL') }}
+nova_catalog_info = compute:nova:{{ volume.identity.get('endpoint_type', 'publicURL') }}
+
+{%- if volume.message_queue.members is defined %}
+transport_url = rabbit://{% for member in volume.message_queue.members -%}
+                             {{ volume.message_queue.user }}:{{ volume.message_queue.password }}@{{ volume.message_queue.host }}:{{ member.get('port', 5672) }}
+                             {%- if not loop.last -%},{%- endif -%}
+                             /{{ volume.message_queue.virtual_host }}
+                         {%- endfor -%}
+{%- else %}
+transport_url = rabbit://{{ volume.message_queue.user }}:{{ volume.message_queue.password }}@{{ volume.message_queue.host }}:{{ member.get('port', 5672) }}/{{ volume.message_queue.virtual_host }}
+{%- endif %}
 
 [oslo_messaging_notifications]
 {%- if volume.notification is mapping %}
@@ -92,21 +109,11 @@
 
 lock_path=/var/lock/cinder
 
-[oslo_messaging_rabbit]
-{%- if volume.message_queue.members is defined %}
-rabbit_hosts = {% for member in volume.message_queue.members -%}
-                   {{ member.host }}:{{ member.get('port', 5672) }}
-                   {%- if not loop.last -%},{%- endif -%}
-               {%- endfor -%}
-{%- else %}
-rabbit_host = {{ volume.message_queue.host }}
-rabbit_port = {{ volume.message_queue.port }}
-{%- endif %}
+[oslo_middleware]
 
-rabbit_userid = {{ volume.message_queue.user }}
-rabbit_password = {{ volume.message_queue.password }}
-rabbit_virtual_host = {{ volume.message_queue.virtual_host }}
-kombu_reconnect_delay=5.0
+enable_proxy_headers_parsing = True
+
+[oslo_messaging_rabbit]
 
 [keystone_authtoken]
 signing_dir=/tmp/keystone-signing-cinder
@@ -126,13 +133,17 @@
 {%- if volume.cache is defined %}
 memcached_servers={%- for member in volume.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
 {%- endif %}
+auth_version = v3
+
+[barbican]
+auth_endpoint=http://{{ controller.identity.host }}:5000
 
 [database]
 idle_timeout=3600
 max_pool_size=30
 max_retries=-1
 max_overflow=40
-connection = {{ volume.database.engine }}+pymysql://{{ volume.database.user }}:{{ volume.database.password }}@{{ volume.database.host }}/{{ volume.database.name }}
+connection = {{ volume.database.engine }}+pymysql://{{ volume.database.user }}:{{ volume.database.password }}@{{ volume.database.host }}/{{ volume.database.name }}?charset=utf8&read_timeout=60
 
 {%- if volume.backend is defined %}