diff --git a/README.rst b/README.rst
index 7b0317c0..69cef3a8 100644
--- a/README.rst
+++ b/README.rst
@@ -24,4 +24,4 @@ This role will install the following:
       roles:
         - { role: "os_nova", tags: [ "os-nova" ] }
       vars:
-        galera_address: "{{ internal_lb_vip_address }}"
+        nova_galera_address: "{{ internal_lb_vip_address }}"
diff --git a/tasks/nova_db_setup.yml b/tasks/nova_db_setup.yml
index 09d98a2b..d88d564d 100644
--- a/tasks/nova_db_setup.yml
+++ b/tasks/nova_db_setup.yml
@@ -17,7 +17,7 @@
   mysql_db:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ nova_galera_address }}"
     name: "{{ nova_galera_database }}"
     state: "present"
   tags:
@@ -27,7 +27,7 @@
   mysql_user:
     login_user: "{{ galera_root_user }}"
     login_password: "{{ galera_root_password }}"
-    login_host: "{{ galera_address }}"
+    login_host: "{{ nova_galera_address }}"
     name: "{{ nova_galera_user }}"
     password: "{{ nova_container_mysql_password }}"
     host: "{{ item }}"
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 7316629e..29d701a7 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -176,7 +176,7 @@ check_revocations_for_cached = False
 
 {% if inventory_hostname not in groups['nova_compute'] %}
 [database]
-connection = mysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ galera_address }}/{{ nova_galera_database }}?charset=utf8
+connection = mysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ nova_galera_address }}/{{ nova_galera_database }}?charset=utf8
 max_overflow = {{ nova_db_max_overflow }}
 max_pool_size = {{ nova_db_max_pool_size }}
 pool_timeout = {{ nova_db_pool_timeout }}