diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml
index 75ceff2f8d..581e152529 100644
--- a/playbooks/galera-install.yml
+++ b/playbooks/galera-install.yml
@@ -82,6 +82,8 @@
       tags:
         - "system-crontab-coordination"
   vars:
+    # overridden here to ensure the correct value for the galera_client role
+    galera_address: 127.0.0.1
     galera_server_id: "{{ inventory_hostname | string_2_int }}"
     galera_wsrep_node_name: "{{ container_name }}"
   tags:
diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index aa9b4161a1..d274488339 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -50,6 +50,7 @@ memcached_port: 11211
 memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_ssh_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 ## Galera
+galera_address: "{{ internal_lb_vip_address }}"
 galera_root_user: "root"
 
 ## RabbitMQ
diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml
index 3503237993..6054a7ce67 100644
--- a/playbooks/os-cinder-install.yml
+++ b/playbooks/os-cinder-install.yml
@@ -239,7 +239,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     cinder_galera_user: cinder
     cinder_galera_database: cinder
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index e6fb4bf2e2..fccb714a4d 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -173,7 +173,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     glance_galera_user: glance
     glance_galera_database: glance
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index 1ba87794e6..a95c7eab4b 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -148,7 +148,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     heat_galera_user: heat
     heat_galera_database: heat
diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml
index dc69397f58..ad3ed345af 100644
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@@ -122,7 +122,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     horizon_galera_user: horizon
     horizon_galera_database: horizon
diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml
index 919ef8cca0..0447a7412a 100644
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@@ -127,7 +127,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     ironic_galera_user: ironic
     ironic_galera_database: ironic
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index 7b4bb6023a..48f8ba1188 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -166,9 +166,7 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
-    galera_root_user: "root"
     keystone_admin_port: 35357
     keystone_galera_user: keystone
     keystone_galera_database: keystone
diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml
index 762b1827f2..ee49b7853d 100644
--- a/playbooks/os-neutron-install.yml
+++ b/playbooks/os-neutron-install.yml
@@ -206,7 +206,6 @@
       tags:
         - "system-crontab-coordination"
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     neutron_galera_user: neutron
     neutron_galera_database: neutron
diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml
index a048f04b68..a40fa25849 100644
--- a/playbooks/os-nova-install.yml
+++ b/playbooks/os-nova-install.yml
@@ -277,7 +277,6 @@
   vars_files:
     - defaults/repo_packages/openstack_other.yml
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     is_metal: "{{ properties.is_metal|default(false) }}"
     nova_galera_user: nova
     nova_galera_database: nova
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
index 667927fac6..f453449f06 100644
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@@ -121,7 +121,6 @@
       when:
         - utility_ssh_private_key is defined
   vars:
-    galera_address: "{{ internal_lb_vip_address }}"
     utility_pip_packages:
       - python-openstackclient
       - python-ceilometerclient