Merge pull request #48 from bmx0r/master

feat(mariadb): set remove_default_accounts as param instead of hardcoding to true

Author: edestecd

manifests/client/mysql.pp

@@ -21,12 +21,12 @@
       daemon_dev_package_name   => $mariadb::params::shared_package_name,
     }
 
-    Class['::mysql::client']
-    -> Class['::mysql::bindings']
+    Class['mysql::client']
+    -> Class['mysql::bindings']
     -> Anchor['mariadb::client::mysql::end']
   }
 
   anchor { 'mariadb::client::mysql::start': }
-  -> Class['::mysql::client']
+  -> Class['mysql::client']
   -> anchor { 'mariadb::client::mysql::end': }
 }

manifests/cluster.pp

@@ -42,6 +42,7 @@
   Boolean $manage_repo          = $mariadb::params::manage_repo,
   $repo_version                 = $mariadb::params::repo_version,
   $dev                          = true,
+  $remove_default_accounts      = $mariadb::params::remove_default_accounts,
   $restart                      = false,
   $service_enabled              = true,
   $service_manage               = true,

manifests/cluster/wsrep_sst_user.pp

@@ -14,7 +14,7 @@
     ensure        => present,
     password_hash => mysql::password($wsrep_sst_password),
     tls_options   => $wsrep_sst_user_tls_options,
-    require       => Class['::mysql::server::root_password'],
+    require       => Class['mysql::server::root_password'],
   }
 
   -> mysql_grant { "${wsrep_sst_user}/*.*":

manifests/params.pp

@@ -6,12 +6,13 @@
   include 'mysql::params'
 
   # ### init vars ####
-  $manage_user     = false
-  $manage_timezone = false
-  $manage_repo     = true
-  $repo_version    = '10.1'
-  $auth_pam        = true
-  $auth_pam_plugin = 'auth_pam.so'
+  $manage_user             = false
+  $manage_timezone         = false
+  $manage_repo             = true
+  $repo_version            = '10.1'
+  $auth_pam                = true
+  $auth_pam_plugin         = 'auth_pam.so'
+  $remove_default_accounts = true
 
   $service_name = $::service_provider ? {
     'systemd' => 'mariadb',

manifests/server.pp

@@ -7,39 +7,36 @@
 #
 
 class mariadb::server (
-  Boolean $manage_user  = $mariadb::params::manage_user,
-  $manage_timezone      = $mariadb::params::manage_timezone,
-  Boolean $manage_repo  = $mariadb::params::manage_repo,
-  $repo_version         = $mariadb::params::repo_version,
-  Boolean $dev          = true,
-  $cluster              = false,
-  $restart              = true,
-  $service_enabled      = true,
-  $service_manage       = true,
-  $service_name         = $mariadb::params::service_name,
-
-  $user                 = $mariadb::params::user,
-  $comment              = $mariadb::params::comment,
-  $uid                  = $mariadb::params::uid,
-  $gid                  = $mariadb::params::gid,
-  $home                 = $mariadb::params::home,
-  $shell                = $mariadb::params::shell,
-  $group                = $mariadb::params::group,
-  $groups               = $mariadb::params::groups,
-
-  $config_file          = $mariadb::params::config_file,
-  $includedir           = $mariadb::params::includedir,
-  $config_dir           = $mariadb::params::config_dir,
-  String $root_password = $mariadb::params::root_password,
-  $override_options     = {},
-
-  Boolean $auth_pam     = $mariadb::params::auth_pam,
-  String $auth_pam_plugin = $mariadb::params::auth_pam_plugin,
-  $storeconfigs_enabled = false,
-
-  $users                = {},
-  $grants               = {},
-  $databases            = {},
+  Boolean $manage_user     = $mariadb::params::manage_user,
+  $manage_timezone         = $mariadb::params::manage_timezone,
+  Boolean $manage_repo     = $mariadb::params::manage_repo,
+  $repo_version            = $mariadb::params::repo_version,
+  Boolean $dev             = true,
+  $cluster                 = false,
+  $remove_default_accounts = $mariadb::params::remove_default_accounts,
+  $restart                 = true,
+  $service_enabled         = true,
+  $service_manage          = true,
+  $service_name            = $mariadb::params::service_name,
+  $user                    = $mariadb::params::user,
+  $comment                 = $mariadb::params::comment,
+  $uid                     = $mariadb::params::uid,
+  $gid                     = $mariadb::params::gid,
+  $home                    = $mariadb::params::home,
+  $shell                   = $mariadb::params::shell,
+  $group                   = $mariadb::params::group,
+  $groups                  = $mariadb::params::groups,
+  $config_file             = $mariadb::params::config_file,
+  $includedir              = $mariadb::params::includedir,
+  $config_dir              = $mariadb::params::config_dir,
+  String $root_password    = $mariadb::params::root_password,
+  $override_options        = {},
+  Boolean $auth_pam        = $mariadb::params::auth_pam,
+  String $auth_pam_plugin  = $mariadb::params::auth_pam_plugin,
+  $storeconfigs_enabled    = false,
+  $users                   = {},
+  $grants                  = {},
+  $databases               = {},
 ) inherits mariadb::params {
 
   $options = mysql::normalise_and_deepmerge($mariadb::params::server_default_options, $override_options)

manifests/server/mysql.pp

@@ -31,7 +31,7 @@
     override_options        => mysql::normalise_and_deepmerge($auth_pam_options, $options),
     package_ensure          => installed,
     package_name            => $package_name,
-    remove_default_accounts => true,
+    remove_default_accounts => $mariadb::server::remove_default_accounts,
     restart                 => $mariadb::server::restart,
     root_password           => $mariadb::server::root_password,
     service_enabled         => $mariadb::server::service_enabled,
@@ -43,6 +43,6 @@
   }
 
   anchor { 'mariadb::server::mysql::start': }
-  -> Class['::mysql::server']
+  -> Class['mysql::server']
   -> anchor { 'mariadb::server::mysql::end': }
 }