diff --git a/deployment/puppet/openstack/manifests/ha/mysqld.pp b/deployment/puppet/openstack/manifests/ha/mysqld.pp
index 82d7f8421a..573eac66e4 100644
--- a/deployment/puppet/openstack/manifests/ha/mysqld.pp
+++ b/deployment/puppet/openstack/manifests/ha/mysqld.pp
@@ -50,12 +50,12 @@ class openstack::ha::mysqld (
     balancermember_port    => 3307,
     define_backups         => true,
     haproxy_config_options => {
-      'hash-type'      => 'consistent',
       'option'         => ['httpchk', 'tcplog','clitcpka','srvtcpka'],
-      'balance'        => 'source',
       'mode'           => 'tcp',
       'timeout server' => '28801s',
-      'timeout client' => '28801s'
+      'timeout client' => '28801s',
+      'stick-table'    => 'type ip size 1',
+      'stick on'       => 'dst'
     },
     balancermember_options => 'check port 49000 inter 20s fastinter 2s downinter 2s rise 3 fall 3',
   }
diff --git a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb
index 5dcebeda56..6ce636c2d9 100644
--- a/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb
+++ b/tests/noop/spec/hosts/openstack-haproxy/openstack-haproxy-mysqld_spec.rb
@@ -40,12 +40,12 @@ describe manifest do
           'balancermember_port'    => 3307,
           'define_backups'         => true,
           'haproxy_config_options' => {
-            'hash-type'      => 'consistent',
             'option'         => ['httpchk', 'tcplog','clitcpka','srvtcpka'],
-            'balance'        => 'source',
             'mode'           => 'tcp',
             'timeout server' => '28801s',
-            'timeout client' => '28801s'
+            'timeout client' => '28801s',
+            'stick-table'    => 'type ip size 1',
+            'stick on'       => 'dst'
           },
           'balancermember_options' =>
             'check port 49000 inter 20s fastinter 2s downinter 2s rise 3 fall 3',