fix unit tests, refs #118

markt-de · Mar 5, 2020 · 71f4837 · 71f4837
1 parent 243e7c3
commit 71f4837
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
@@ -20,7 +20,7 @@
         }
       }
     } elsif $galera::vendor_type == 'percona' {
-      if (versioncmp($galera::vendor_version, '5.6') >= 0) {
+      if (versioncmp($galera::vendor_version_real, '5.6') >= 0) {
         # Perona installs two independent systemd services:
         #   mysql - for normal operation
         #   mysql@bootstrap - for bootstrapping a new cluster
@@ -34,9 +34,9 @@
         # able to startup as primary node.
         service { 'mysql@bootstrap':
           ensure  => 'stopped',
-          require => Exec['bootstrap_galera_cluster'],
           before  => Service['mysqld'],
         }
+        Exec<| title == 'bootstrap_galera_cluster' |> -> Service['mysql@bootstrap']
       }
     }
   }

diff --git a/spec/classes/galera_init_spec.rb b/spec/classes/galera_init_spec.rb
@@ -292,7 +292,7 @@
             p_client_package_name: 'Percona-XtraDB-Cluster-client-57',
             p_galera_package_name: 'Percona-XtraDB-Cluster-galera-3',
             p_libgalera_location: '/usr/lib64/libgalera_smm.so',
-            p_mysql_package_name: 'Percona-XtraDB-Cluster-server-57',
+            p_mysql_package_name: 'Percona-XtraDB-Cluster-57',
             p_mysql_service_name: 'mysql',
             p_xtrabackup_package: 'percona-xtrabackup-24',
             nmap_package_name: 'nmap' }

diff --git a/spec/classes/galera_redhat_spec.rb b/spec/classes/galera_redhat_spec.rb
@@ -50,7 +50,7 @@
 
       let(:os_params) do
         {
-          p_additional_packages: 'Percona-XtraDB-Cluster-shared-compat-57',
+          p_additional_packages: 'nmap',
         }
       end
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ @@
           let(:os_params) do
             {
-              p_additional_packages: 'Percona-XtraDB-Cluster-shared-compat-57',
+              p_additional_packages: 'nmap',
             }
           end
@@ Expand Down @@