Merge pull request #45 from edestecd/use-renamed-deepmerge-function

Use the renamed deepmerge function normalise_and_deepmerge

Author: edestecd

CHANGELOG

@@ -1,3 +1,4 @@
+        * Use renamed 'deepmerge' function 'normalise_and_deepmerge'
 2020-03-06 (2.0.1)  Brad Koby
         * Stop using absolute class names
         * Bump puppetlabs-apt max version 

manifests/client.pp

@@ -20,7 +20,7 @@
   $override_options    = {},
 ) inherits mariadb::params {
 
-  $options = mysql::deepmerge($mariadb::params::client_default_options, $override_options)
+  $options = mysql::normalise_and_deepmerge($mariadb::params::client_default_options, $override_options)
 
   if $manage_repo {
     class { 'mariadb::repo':

manifests/cluster.pp

@@ -81,8 +81,8 @@
   $databases                    = {},
 ) inherits mariadb::params {
 
-  $cluster_options = mysql::deepmerge($mariadb::params::cluster_default_options, $override_options)
-  $galera_options  = mysql::deepmerge($mariadb::params::galera_default_options, $galera_override_options)
+  $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)
 
   anchor { 'mariadb::cluster::start': }
   -> class { 'mariadb::server':

manifests/cluster/galera_config.pp

@@ -32,7 +32,7 @@
       'wsrep_sst_method'      => $mariadb::cluster::wsrep_sst_method,
     },
   }
-  $options = mysql::deepmerge($options_from_params, $mariadb::cluster::galera_options)
+  $options = mysql::normalise_and_deepmerge($options_from_params, $mariadb::cluster::galera_options)
   $includedir = false
 
   if $mariadb::cluster::wsrep_sst_method in ['xtrabackup', 'xtrabackup-v2'] {

manifests/server.pp

@@ -42,7 +42,7 @@
   $databases            = {},
 ) inherits mariadb::params {
 
-  $options = mysql::deepmerge($mariadb::params::server_default_options, $override_options)
+  $options = mysql::normalise_and_deepmerge($mariadb::params::server_default_options, $override_options)
 
   if $manage_repo {
     class { 'mariadb::repo':

manifests/server/mysql.pp

@@ -28,7 +28,7 @@
   class { 'mysql::server':
     config_file             => $mariadb::server::config_file,
     includedir              => $mariadb::server::includedir,
-    override_options        => mysql::deepmerge($auth_pam_options, $options),
+    override_options        => mysql::normalise_and_deepmerge($auth_pam_options, $options),
     package_ensure          => installed,
     package_name            => $package_name,
     remove_default_accounts => true,

metadata.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "puppetlabs/mysql",
-      "version_requirement": ">= 7.0.0 < 10.8.0"
+      "version_requirement": ">= 9.0.0 < 10.8.0"
     }
   ],
   "operatingsystem_support": [