Fixed server package name so it isn't hardcoded to mysql

puppetlabs · May 27, 2015 · 4bab65e · j-russell · May 27, 2015 · igalic
1 parent 18e45a0
commit 4bab65e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/manifests/server/installdb.pp b/manifests/server/installdb.pp
@@ -11,16 +11,15 @@
 
     if $mysql::server::manage_config_file {
       $install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}"
-    } else {
-      $install_db_args = "--basedir=${basedir} --datadir=${datadir} --user=${mysqluser}"
+
     }
 
     exec { 'mysql_install_db':
       command   => "mysql_install_db ${install_db_args}",
       creates   => "${datadir}/mysql",
       logoutput => on_failure,
       path      => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-      require   => Package['mysql-server'],
+      require   => Package[$mysql::server::package_name],
     }
 
     if $mysql::server::restart {

diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -31,7 +31,7 @@
     name     => $mysql::server::service_name,
     enable   => $mysql::server::real_service_enabled,
     provider => $mysql::server::service_provider,
-    require  => Package['mysql-server'],
+    require  => Package[$mysql::server::service_name],
   }
 
   # only establish ordering between config file and service if