do not specify default values for $vendor_type and $vendor_version an…

…ymore
markt-de · Aug 9, 2024 · c30456b · c30456b
1 parent 12f5185
commit c30456b
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,15 +11,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Add new parameter `$status_systemd_service_name`
 * Add systemd-based status check ([#191])
 * Add support for new operating systems
+* Add support for Percona XtraDB 8.0 and MariaDB 10.11
 
 ### Changed
+* Remove default values: `$vendor_type`, `$vendor_version`
 * Disable option `pxc-encrypt-cluster-traffic` on Percona XtraDB 8.0
-* Change default version of Codership/MySQL to 8.0
-* Change default version of MariaDB to 10.11
-* Change default version of Percona XtraDB to 8.0
 * Enable systemd-based status check on RHEL 9, Debian 12 and Ubuntu 24.04 ([#191])
 * Add new dependency for systemd-based status check ([#191])
 * Merge internal $default_options from multiple hierarchy levels
+* Switch unit tests to Codership/MySQL 8.0, MariaDB 10.11 and XtraDB 8.0
 * Extend unit tests ([#191])
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -48,6 +48,10 @@ Basic usage requires only the FQDN of the master node, a list of IP addresses of
 
 ```puppet
 class { 'galera':
+  # Galera vendor and version
+  vendor_type    => 'codership',
+  vendor_version => '8.0',
+  # Galera cluster config
   cluster_name    => 'mycluster',
   galera_servers  => ['10.0.99.101', '10.0.99.102', '10.0.99.103'],
   galera_master   => 'node1.example.com',
@@ -56,15 +60,6 @@ class { 'galera':
 }
 ```
 
-This will install the default packages and version. However, in a production environment you should definitely set the vendor and version variables to the desired value, because the default values might change:
-
-```puppet
-class { 'galera':
-  vendor_type    => 'percona',
-  vendor_version => '8.0',
-  ...
-```
-
 On Debian/Ubuntu systems the user `debian-sys-maint@localhost` is required for updates and will be created automatically, but you should set a proper password when using these platforms:
 
 ```puppet

diff --git a/data/FreeBSD-family.yaml b/data/FreeBSD-family.yaml
@@ -49,6 +49,11 @@ galera::mariadb::106::client_package_name: 'mariadb106-client'
 galera::mariadb::106::galera_package_name: 'galera26'
 galera::mariadb::106::mysql_package_name: 'mariadb106-server'
 
+galera::mariadb::1011::arbitrator_package_name: 'galera26'
+galera::mariadb::1011::client_package_name: 'mariadb1011-client'
+galera::mariadb::1011::galera_package_name: 'galera26'
+galera::mariadb::1011::mysql_package_name: 'mariadb1011-server'
+
 #
 # MariaDB - default settings
 #
@@ -82,6 +87,12 @@ galera::sst::mariabackup::mariadb::103::additional_packages:
   - 'socat'
 galera::sst::mariabackup::mariadb::104::additional_packages:
   - 'socat'
+galera::sst::mariabackup::mariadb::105::additional_packages:
+  - 'socat'
+galera::sst::mariabackup::mariadb::106::additional_packages:
+  - 'socat'
+galera::sst::mariabackup::mariadb::1011::additional_packages:
+  - 'socat'
 galera::sst::xtrabackup::additional_packages:
   - 'xtrabackup'
 galera::sst::xtrabackup::codership::57::additional_packages:

diff --git a/data/common.yaml b/data/common.yaml
@@ -77,7 +77,7 @@ galera::validate::delay: 3
 galera::validate::inv_catch: undef
 galera::validate::retries: 20
 galera::validate_connection: true
-galera::vendor_type: 'percona'
+galera::vendor_type: ~
 galera::wsrep_group_comm_port: 4567
 galera::wsrep_inc_state_transfer_port: 4568
 galera::wsrep_sst_auth: "root:<%= $root_password %>"
@@ -97,7 +97,6 @@ galera::mariadb::additional_packages:
 galera::codership::default_options:
   mysqld:
     wsrep_sst_auth: "\"<%= $wsrep_sst_auth_real %>\""
-galera::codership::default_version: '8.0'
 galera::codership::galera_package_ensure: 'present'
 
 # Percona XtraDB removed support for wsrep_sst_auth in version 8.0,
@@ -113,14 +112,12 @@ galera::percona::80::default_options:
     # On XtraDB 8.0 the option pxc-encrypt-cluster-traffic is enabled by
     # default. Disable it to make it easier to bootstrap new clusters.
     pxc-encrypt-cluster-traffic: 'OFF'
-galera::percona::default_version: '8.0'
 # Percona does not allow installation of wsrep-enabled server and wsrep provider.
 galera::percona::galera_package_ensure: 'absent'
 
 galera::mariadb::default_options:
   mysqld:
     wsrep_sst_auth: "\"<%= $wsrep_sst_auth_real %>\""
-galera::mariadb::default_version: '10.11'
 galera::mariadb::galera_package_ensure: 'present'
 
 # binlog_format is deprecated in MySQL, but still required for MariaDB

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -284,6 +284,7 @@
 class galera (
   # parameters that need to be evaluated early
   Enum['codership', 'mariadb', 'percona'] $vendor_type,
+  String $vendor_version,
   # required parameters
   Boolean $arbitrator,
   String $arbitrator_options,
@@ -357,18 +358,11 @@
   Optional[String] $status_log_on_success = undef,
   Optional[String] $status_log_type = undef,
   Optional[String] $status_service_type = undef,
-  Optional[String] $vendor_version = undef,
 ) {
-  # Fetch appropiate default values from module data, depending on the values
-  # of $vendor_type and $vendor_version.
-  # XXX: Originally this was supposed to take place when evaluating the class
-  # parameters. Now this is basically an ugly compatibility layer to support
-  # overriding parameters in non-hiera configurations (where solely relying
-  # on lookup() simply does not work). Should be refactored when a better
-  # solution is available.
-  if !$vendor_version {
-    $vendor_version_real = lookup("${module_name}::${vendor_type}::default_version")
-  } else { $vendor_version_real = $vendor_version }
+  # Adjust $vendor_version for use with lookup()
+  # The '_real' variable is kept for compatibility reasons, it may be
+  # used in inline epp templates.
+  $vendor_version_real = $vendor_version
   $vendor_version_internal = regsubst($vendor_version_real, '\.', '', 'G')
 
   # Percona supports 'xtrabackup-v2', but this value cannot be used in our automatic

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -3,9 +3,9 @@
 #
 class galera::repo {
   # Adjust $vendor_version for use with lookup()
-  if !$galera::vendor_version {
-    $vendor_version_real = lookup("${module_name}::${galera::vendor_type}::default_version")
-  } else { $vendor_version_real = $galera::vendor_version }
+  # The '_real' variable is kept for compatibility reasons, it may be
+  # used in inline epp templates.
+  $vendor_version_real = $galera::vendor_version
   $vendor_version_internal = regsubst($vendor_version_real, '\.', '', 'G')
 
   # Adjust $wsrep_sst_method for use with lookup()

diff --git a/manifests/repo/config.pp b/manifests/repo/config.pp
@@ -8,9 +8,9 @@
   String $repo = $title,
 ) {
   # Adjust $vendor_version for use with lookup() and inline_epp()
-  if !$galera::vendor_version {
-    $vendor_version_real = lookup("${module_name}::${galera::vendor_type}::default_version")
-  } else { $vendor_version_real = $galera::vendor_version }
+  # The '_real' variable is kept for compatibility reasons, it may be
+  # used in inline epp templates.
+  $vendor_version_real = $galera::vendor_version
   $vendor_version_internal = regsubst($vendor_version_real, '\.', '', 'G')
 
   # Prepare $wsrep_sst_method for use with inline_epp()

diff --git a/spec/classes/galera_arbitrator_spec.rb b/spec/classes/galera_arbitrator_spec.rb
@@ -19,6 +19,8 @@
           root_password: 'test',
           deb_sysmaint_password: 'test',
           status_password: 'test',
+          vendor_type: 'percona',
+          vendor_version: '8.0',
         }
       end
 

diff --git a/spec/classes/galera_debian_hacks_spec.rb b/spec/classes/galera_debian_hacks_spec.rb
@@ -6,7 +6,9 @@
        cluster_name    => 'testcluster',
        galera_master   => 'control1',
        package_ensure  => 'present',
-       status_password => 'nonempty'
+       status_password => 'nonempty',
+       vendor_type     => 'percona',
+       vendor_version  => '8.0',
     }"
   end
 
@@ -35,7 +37,7 @@
         facts
       end
 
-      case facts[:osfamily]
+      case facts[:os]['family']
       when 'Debian'
         it_configures 'galera workarounds on Debian and Ubuntu'
       end

diff --git a/spec/classes/galera_debian_spec.rb b/spec/classes/galera_debian_spec.rb
@@ -18,7 +18,7 @@
       root_password: 'test',
       status_password: 'nonempty',
       vendor_type: 'percona',
-      vendor_version: '5.7',
+      vendor_version: '8.0',
       wsrep_group_comm_port: 4567,
       wsrep_inc_state_transfer_port: 4568,
       wsrep_sst_method: 'rsync',
@@ -142,7 +142,7 @@
         facts
       end
 
-      case facts[:osfamily]
+      case facts[:os]['family']
       when 'Debian'
         if facts[:os]['name'] == 'Debian' && Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '12') >= 0
           it_configures 'galera on Debian'

diff --git a/spec/classes/galera_freebsd_spec.rb b/spec/classes/galera_freebsd_spec.rb
@@ -20,7 +20,7 @@
       root_password: 'test',
       status_password: 'nonempty',
       vendor_type: 'percona',
-      vendor_version: '5.7',
+      vendor_version: '8.0',
       wsrep_group_comm_port: 4567,
       wsrep_inc_state_transfer_port: 4568,
       wsrep_sst_method: 'rsync',
@@ -61,7 +61,7 @@
         facts.merge({})
       end
 
-      case facts[:osfamily]
+      case facts[:os]['family']
       when 'FreeBSD'
         it_configures 'galera on FreeBSD'
       end