Skip to content

fix: Make WSREP SST user's privileges customizable #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Make WSREP SST user's privileges customizable #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/cluster.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
$wsrep_sst_password = $mariadb::params::wsrep_sst_password,
$wsrep_sst_user_tls_options = undef,
$wsrep_sst_user_grant_options = undef,
Enum['mariabackup', 'mysqldump', 'rsync', 'rsync_wan', 'xtrabackup', 'xtrabackup-v2'] $wsrep_sst_method = $mariadb::params::wsrep_sst_method, # lint:ignore:140chars
Array[String] $wresp_sst_user_privileges = $mariadb::params::wsrep_sst_user_privileges,
Mariadb::Wsrep_SST_Method $wsrep_sst_method = $mariadb::params::wsrep_sst_method,
$root_password = $mariadb::params::root_password,
$override_options = {},
$galera_override_options = {},
Expand All @@ -81,7 +82,6 @@
$grants = {},
$databases = {},
) inherits mariadb::params {

$cluster_options = mysql::normalise_and_deepmerge($mariadb::params::cluster_default_options, $override_options)
$galera_options = mysql::normalise_and_deepmerge($mariadb::params::galera_default_options, $galera_override_options)

Expand Down
2 changes: 1 addition & 1 deletion manifests/cluster/auth.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#

class mariadb::cluster::auth {

if $mariadb::cluster::wsrep_sst_password != 'UNSET' {
$wsrep_sst_peers = any2array($mariadb::cluster::wsrep_sst_user_peers)
$wsrep_sst_users = prefix($wsrep_sst_peers, "${mariadb::cluster::wsrep_sst_user}@")
Expand All @@ -13,6 +12,7 @@
wsrep_sst_password => $mariadb::cluster::wsrep_sst_password,
wsrep_sst_user_tls_options => $mariadb::cluster::wsrep_sst_user_tls_options,
wsrep_sst_user_grant_options => $mariadb::cluster::wsrep_sst_user_grant_options,
wsrep_sst_user_privileges => $mariadb::cluster::wsrep_sst_user_privileges,
}
}
}
28 changes: 19 additions & 9 deletions manifests/cluster/wsrep_sst_user.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
# wsrep_sst_user.pp
# Manage one wsrep_sst_auth user.
# @summary Manage one wsrep_sst_auth user
#
# This user is used to sync between cluster nodes and thus needs root like access to everything.
#

# @param wsrep_sst_password
# @param wsrep_sst_user
# @param wsrep_sst_user_tls_options
# @param wsrep_sst_user_grant_options
# @param wsrep_sst_user_privileges
#
define mariadb::cluster::wsrep_sst_user (
$wsrep_sst_password,
$wsrep_sst_user = $name,
$wsrep_sst_user_tls_options = undef,
$wsrep_sst_user_grant_options = undef,
String $wsrep_sst_password,
String $wsrep_sst_user = $name,
Array[String] $wsrep_sst_user_tls_options = undef,
Array[String] $wsrep_sst_user_grant_options = undef,
Array[String] $wsrep_sst_user_privileges = [
'RELOAD',
'PROCESS',
'LOCK TABLES',
'BINLOG MONITOR',
],
) {

mysql_user { $wsrep_sst_user:
ensure => present,
password_hash => mysql::password($wsrep_sst_password),
Expand All @@ -21,7 +31,7 @@
ensure => present,
user => $wsrep_sst_user,
table => '*.*',
privileges => ['ALL'],
privileges => $wsrep_sst_user_privileges,
options => $wsrep_sst_user_grant_options,
}
}
25 changes: 15 additions & 10 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# params.pp
# Set up MariaDB Cluster parameters defaults etc.
#

class mariadb::params {
include 'mysql::params'

Expand All @@ -20,15 +19,21 @@
}

# wsrep patch config
$wsrep_cluster_address = undef
$wsrep_cluster_peers = undef
$wsrep_cluster_port = '4567'
$wsrep_cluster_name = undef
$wsrep_sst_user = 'wsrep_sst'
$wsrep_sst_user_peers = '%'
$wsrep_sst_password = 'UNSET' # lint:ignore:security_password_in_code
$wsrep_sst_method = 'mysqldump'
$root_password = 'UNSET' # lint:ignore:security_password_in_code
$wsrep_cluster_address = undef
$wsrep_cluster_peers = undef
$wsrep_cluster_port = '4567'
$wsrep_cluster_name = undef
$wsrep_sst_user = 'wsrep_sst'
$wsrep_sst_user_peers = '%'
$wsrep_sst_password = 'UNSET' # lint:ignore:security_password_in_code
$wsrep_sst_user_privileges = [
'RELOAD',
'PROCESS',
'LOCK TABLES',
'BINLOG MONITOR',
]
$wsrep_sst_method = 'mysqldump'
$root_password = 'UNSET' # lint:ignore:security_password_in_code

if ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemrelease, '6.0') >= 0) {
# client.pp
Expand Down
8 changes: 8 additions & 0 deletions manifests/types/wsrep_sst_method.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
type Mariadb::Wsrep_SST_Method = Enum[
'mariabackup',
'mysqldump',
'rsync',
'rsync_wan',
'xtrabackup',
'xtrabackup-v2'
]
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edestecd-mariadb",
"version": "2.1.2",
"version": "2.1.3",
"author": "Chris Edester",
"summary": "Puppet Module for managing MariaDB",
"license": "GPL-3.0+",
Expand Down