Merge pull request #467 from apenney/sles-fixes

Ashley Penney · Ashley Penney · commit ca5269f81355 · 2014-02-26T09:56:35.000-05:00
This fixes:
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -85,7 +85,7 @@
       # mysql::bindings
       $java_package_name   = 'mysql-connector-java'
       $perl_package_name   = 'perl-DBD-mysql'
-      $php_package_name    = 'apache2-mod_php5'
+      $php_package_name    = 'apache2-mod_php53'
       $python_package_name = 'python-mysql'
       $ruby_package_name   = $::operatingsystem ? {
         /OpenSuSE/         => 'rubygem-mysql',
diff --git a/spec/acceptance/mysql_bindings_spec.rb b/spec/acceptance/mysql_bindings_spec.rb
@@ -13,7 +13,7 @@
 when 'Suse'
   java_package   = 'mysql-connector-java'
   perl_package   = 'perl-DBD-MySQL'
-  php_package    = 'apache2-mod_php5'
+  php_package    = 'apache2-mod_php53'
   python_package = 'python-mysql'
   case operatingsystem
   when /OpenSuSE/
diff --git a/spec/acceptance/mysql_server_config_spec.rb b/spec/acceptance/mysql_server_config_spec.rb
@@ -21,7 +21,7 @@ class { 'mysql::server':
       class { 'mysql::server':
         config_file        => '/etc/my.cnf',
         manage_config_file => false,
-        restart            => false,
+        manage_service     => false,
       }
     EOS
     # Make sure this doesn't exist so we can test if puppet

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class { 'mysql::server':`
`21`	`21`	`class { 'mysql::server':`
`22`	`22`	`config_file => '/etc/my.cnf',`
`23`	`23`	`manage_config_file => false,`
`24`		`- restart => false,`
	`24`	`+ manage_service => false,`
`25`	`25`	`}`
`26`	`26`	`EOS`
`27`	`27`	`# Make sure this doesn't exist so we can test if puppet`