Further SLES fixes to tests.

puppetlabs · Feb 26, 2014 · c3a3e3a · c3a3e3a
1 parent 2d1a9f9
commit c3a3e3a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/spec/acceptance/mysql_bindings_spec.rb b/spec/acceptance/mysql_bindings_spec.rb
@@ -12,7 +12,7 @@
   ruby_package   = 'ruby-mysql'
 when 'Suse'
   java_package   = 'mysql-connector-java'
-  perl_package   = 'perl-DBD-MySQL'
+  perl_package   = 'perl-DBD-mysql'
   php_package    = 'apache2-mod_php53'
   python_package = 'python-mysql'
   case operatingsystem

diff --git a/spec/acceptance/mysql_server_spec.rb b/spec/acceptance/mysql_server_spec.rb
@@ -8,10 +8,18 @@
     service_provider = 'undef'
     mycnf            = '/etc/my.cnf'
   when 'Suse'
-    package_name     = 'mysql-community-server'
+    case fact('operatingsystem')
-    service_name     = 'mysql'
+    when 'OpenSuSE'
-    service_provider = 'undef'
+      package_name     = 'mysql-community-server'
-    mycnf            = '/etc/my.cnf'
+      service_name     = 'mysql'
+      service_provider = 'undef'
+      mycnf            = '/etc/my.cnf'
+    when 'SLES'
+      package_name     = 'mysql'
+      service_name     = 'mysql'
+      service_provider = 'undef'
+      mycnf            = '/etc/my.cnf'
+    end
   when 'Debian'
     package_name     = 'mysql-server'
     service_name     = 'mysql'

diff --git a/spec/acceptance/nodesets/sles-11-x64.yml b/spec/acceptance/nodesets/sles-11-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  sles-11-x64.local:
+    roles:
+      - master
+    platform: sles-11-x64
+    box : sles-11sp1-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+    type: foss