diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp
index c7bd406d..3c1a018a 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql.pp
@@ -20,7 +20,7 @@ class cloud::database::sql (
     $api_eth                        = $os_params::api_eth,
     $service_provider               = 'sysv',
     $galera_nextserver              = $os_params::galera_nextserver,
-    $galera_master                  = $os_params::galera_master,
+    $galera_master_name             = $os_params::galera_master_name,
     $keystone_db_host               = $os_params::keystone_db_host,
     $keystone_db_user               = $os_params::keystone_db_user,
     $keystone_db_password           = $os_params::keystone_db_password,
@@ -98,7 +98,7 @@ class cloud::database::sql (
     notify              => Service['xinetd'],
   }
 
-  if $::hostname == $galera_master {
+  if $::hostname == $galera_master_name {
 
 # OpenStack DB
     class { 'keystone::db::mysql':
@@ -176,7 +176,7 @@ class cloud::database::sql (
 
     Database_user<<| |>>
 
-  } # if $::hostname == $galera_master
+  } # if $::hostname == $galera_master_name
 
   # Haproxy http monitoring
   file_line { 'mysqlchk-in-etc-services':
@@ -236,7 +236,7 @@ class cloud::database::sql (
     ipaddresses       => $api_eth,
     ports             => '3306',
     options           =>
-      inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname != @galera_master -%>backup<% end %>')
+      inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname != @galera_master_name -%>backup<% end %>')
   }
 
 }
diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_spec.rb
index 7236c653..d2d6ed95 100644
--- a/spec/classes/cloud_database_sql_spec.rb
+++ b/spec/classes/cloud_database_sql_spec.rb
@@ -30,7 +30,7 @@ describe 'cloud::database::sql' do
       {
         :service_provider               => 'sysv',
         :api_eth                        => '10.0.0.1',
-        :galera_master                  => '10.0.0.1',
+        :galera_master_name             => 'os-ci-test1',
         :galera_nextserver              => ['10.0.0.1','10.0.0.2','10.0.0.3'],
         :keystone_db_host               => '10.0.0.1',
         :keystone_db_user               => 'keystone',
@@ -96,7 +96,7 @@ describe 'cloud::database::sql' do
     context 'configure databases on the galera master server' do
 
       before :each do
-        facts.merge!( :hostname => '10.0.0.1' )
+        facts.merge!( :hostname => 'os-ci-test1' )
       end
 
       it 'configure keystone database' do
diff --git a/templates/database/mysql.conf.erb b/templates/database/mysql.conf.erb
index 96c47ac0..84dc2018 100644
--- a/templates/database/mysql.conf.erb
+++ b/templates/database/mysql.conf.erb
@@ -42,8 +42,8 @@ innodb_autoinc_lock_mode        = 2
 innodb_locks_unsafe_for_binlog  = 1
 wsrep_provider                  = "<%= @wsrep_provider %>"
 wsrep_cluster_name              = "galera_cluster"
-<% if @hostname != @galera_master -%>
-# This node is not Galera Master (connect wsrep to galera_master)
+<% if @hostname != @galera_master_name -%>
+# This node is not Galera Master (connect wsrep to galera_master_name)
 wsrep_cluster_address           = "gcomm://<%= @galera_nextserver[0] %>"
 <% else -%>
 # This node is Galera Master (connect wsrep to localhost)