diff --git a/deployment/puppet/galera/manifests/init.pp b/deployment/puppet/galera/manifests/init.pp
index bebf7b0240..546e2c8140 100644
--- a/deployment/puppet/galera/manifests/init.pp
+++ b/deployment/puppet/galera/manifests/init.pp
@@ -13,6 +13,7 @@ class galera (
   $primary_controller   = false,
   $node_address         = $ipaddress_eth0,
   $setup_multiple_gcomm = true,
+  $skip_name_resolve    = false,
   $node_addresses       = [
     $ipaddress_eth0]) {
   include galera::params
diff --git a/deployment/puppet/galera/templates/wsrep.cnf.erb b/deployment/puppet/galera/templates/wsrep.cnf.erb
index a412c68e07..8ffced8263 100644
--- a/deployment/puppet/galera/templates/wsrep.cnf.erb
+++ b/deployment/puppet/galera/templates/wsrep.cnf.erb
@@ -132,3 +132,6 @@ wsrep_sst_auth=<%= mysql_user %>:<%= mysql_password %>
 
 # Protocol version to use
 # wsrep_protocol_version=
+<% if skip_name_resolve -%>
+skip-name-resolve
+<% end -%>
diff --git a/deployment/puppet/mysql/manifests/server.pp b/deployment/puppet/mysql/manifests/server.pp
index b3850dd748..c9fe5564e8 100644
--- a/deployment/puppet/mysql/manifests/server.pp
+++ b/deployment/puppet/mysql/manifests/server.pp
@@ -25,7 +25,8 @@ class mysql::server (
   $galera_cluster_name = undef,
   $primary_controller = primary_controller,
   $galera_node_address = undef,
-  $galera_nodes = undef
+  $galera_nodes = undef,
+  $mysql_skip_name_resolve = false,
 ) inherits mysql::params {
     
   if ($custom_setup_class == undef) {
@@ -64,6 +65,7 @@ class mysql::server (
 	    primary_controller => $primary_controller,
 	    node_address => $galera_node_address,
       node_addresses => $galera_nodes,
+        skip_name_resolve => $mysql_skip_name_resolve,
     }
 #    require($galera_class)
   }
diff --git a/deployment/puppet/openstack/manifests/controller.pp b/deployment/puppet/openstack/manifests/controller.pp
index 96c6eedf43..284148c22a 100644
--- a/deployment/puppet/openstack/manifests/controller.pp
+++ b/deployment/puppet/openstack/manifests/controller.pp
@@ -158,6 +158,7 @@ class openstack::controller (
   $galera_node_address     = '127.0.0.1',
   $glance_backend          = 'file',
   $galera_nodes            = ['127.0.0.1'],
+  $mysql_skip_name_resolve = false,
   $manage_volumes          = false,
   $nv_physical_volume      = undef,
   $use_syslog              = false,
@@ -214,6 +215,7 @@ class openstack::controller (
       galera_node_address    => $galera_node_address ,
       galera_nodes           => $galera_nodes,
       custom_setup_class     => $custom_mysql_setup_class,
+      mysql_skip_name_resolve => $mysql_skip_name_resolve,
     }
   }
   ####### KEYSTONE ###########
diff --git a/deployment/puppet/openstack/manifests/controller_ha.pp b/deployment/puppet/openstack/manifests/controller_ha.pp
index 47a1ac4046..d9ead7b54c 100644
--- a/deployment/puppet/openstack/manifests/controller_ha.pp
+++ b/deployment/puppet/openstack/manifests/controller_ha.pp
@@ -126,6 +126,7 @@ class openstack::controller_ha (
    $quantum_netnode_on_cnt  = false,
    $quantum_gre_bind_addr   = $internal_address,
    $quantum_external_ipinfo = {},
+   $mysql_skip_name_resolve = false,
  ) {
 
     # haproxy
@@ -291,6 +292,7 @@ local0.* -/var/log/haproxy.log'
       primary_controller      => $primary_controller,
       galera_node_address     => $internal_address,
       galera_nodes            => $galera_nodes,
+      mysql_skip_name_resolve => $mysql_skip_name_resolve,
       admin_email             => $admin_email,
       admin_user              => $admin_user,
       admin_password          => $admin_password,
diff --git a/deployment/puppet/openstack/manifests/db/mysql.pp b/deployment/puppet/openstack/manifests/db/mysql.pp
index 89220e135b..081057f648 100644
--- a/deployment/puppet/openstack/manifests/db/mysql.pp
+++ b/deployment/puppet/openstack/manifests/db/mysql.pp
@@ -65,6 +65,7 @@ class openstack::db::mysql (
     $primary_controller     = false,
     $galera_node_address = '127.0.0.1',
     $galera_nodes = ['127.0.0.1'],
+    $mysql_skip_name_resolve = false,
     $custom_setup_class = undef
 ) {
 
@@ -89,6 +90,7 @@ class openstack::db::mysql (
     galera_nodes      => $galera_nodes,
     enabled => $enabled,
     custom_setup_class => $custom_setup_class,
+    mysql_skip_name_resolve => $mysql_skip_name_resolve,
   }