From bef00cf5b7188347df80671642662bb152559cd8 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Wed, 27 Jan 2016 13:50:24 +0100
Subject: [PATCH] Drop dependancy on puppet-galera

wsrep options can be easily passed to galera via mysql module.
The puppet-galera module is now obsolete and will be dropped from
OPM.

Change-Id: I56281e76686853d4c0cf6e11249111c8fe28d309
---
 packstack/plugins/puppet_950.py               |  2 +-
 packstack/puppet/templates/mariadb_install.pp | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py
index a1c38b953..3ab23a1b3 100644
--- a/packstack/plugins/puppet_950.py
+++ b/packstack/plugins/puppet_950.py
@@ -141,7 +141,7 @@ def run_cleanup(config, messages):
 
 def copy_puppet_modules(config, messages):
     os_modules = ' '.join(('aodh', 'apache', 'ceilometer', 'certmonger',
-                           'cinder', 'concat', 'firewall', 'glance', 'galera',
+                           'cinder', 'concat', 'firewall', 'glance',
                            'heat', 'horizon', 'inifile', 'ironic', 'keystone',
                            'manila', 'memcached', 'mongodb', 'mysql',
                            'neutron', 'nova', 'nssdb', 'openstack',
diff --git a/packstack/puppet/templates/mariadb_install.pp b/packstack/puppet/templates/mariadb_install.pp
index 331adb4de..ac2bd4c72 100644
--- a/packstack/puppet/templates/mariadb_install.pp
+++ b/packstack/puppet/templates/mariadb_install.pp
@@ -10,25 +10,24 @@ $bind_address = hiera('CONFIG_IP_VERSION') ? {
   # TO-DO(mmagr): Add IPv6 support when hostnames are used
 }
 
-# hack around galera packaging issue, they are duplicating
-# bind-address config option in galera.cnf
-class { '::galera::server':
-  wsrep_bind_address    => $bind_address,
-  manage_service        => false,
-  wsrep_provider        => 'none',
-  create_mysql_resource => false,
-}
+$mysql_root_password = hiera('CONFIG_MARIADB_PW')
 
 class { '::mysql::server':
   package_name     => 'mariadb-galera-server',
   restart          => true,
-  root_password    => hiera('CONFIG_MARIADB_PW'),
+  root_password    => $mysql_root_password,
   require          => Package['mariadb-server'],
   override_options => {
-    'mysqld' => { bind_address           => $bind_address,
-                  default_storage_engine => 'InnoDB',
-                  max_connections        => '1024',
-                  open_files_limit       => '-1',
+    'mysqld' => {
+      'bind_address'           => $bind_address,
+      'default_storage_engine' => 'InnoDB',
+      'max_connections'        => '1024',
+      'open_files_limit'       => '-1',
+      # galera options
+      'wsrep_provider'         => 'none',
+      'wsrep_cluster_name'     => 'galera_cluster',
+      'wsrep_sst_method'       => 'rsync',
+      'wsrep_sst_auth'         => "root:${mysql_root_password}",
     },
   },
 }