diff --git a/defaults/main.yml b/defaults/main.yml
index 0ab9669..6b07a19 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -40,6 +40,7 @@ magnum_service_project_name: service
 magnum_service_role_names:
   - admin
 magnum_service_region: RegionOne
+magnum_cinder_service_region: "{{ magnum_service_region }}"
 magnum_bind_port: 9511
 magnum_service_publicuri_proto: http
 magnum_service_publicurl: "{{ magnum_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}"
diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2
index ff0225f..de7f01d 100644
--- a/templates/magnum.conf.j2
+++ b/templates/magnum.conf.j2
@@ -12,7 +12,7 @@ host = {{ ansible_host }}
 endpoint_type = internalURL
 
 [cinder_client]
-region_name = {{ cinder_service_region }}
+region_name = {{ magnum_cinder_service_region }}
 endpoint_type = internalURL
 
 [database]
diff --git a/tests/magnum-test-vars.yml b/tests/magnum-test-vars.yml
index 702e03b..bdef59c 100644
--- a/tests/magnum-test-vars.yml
+++ b/tests/magnum-test-vars.yml
@@ -1,6 +1,5 @@
 ---
 magnum_developer_mode: true
-cinder_service_region: RegionOne
 magnum_galera_password: secrete
 magnum_galera_address:  "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
 magnum_service_password: secrete