Merge pull request #727 from cyberious/InstallNameRefacter

Morgan Haskel · Morgan Haskel · commit c095230b9e68 · 2015-06-19T11:13:41.000-07:00
(maint) Package was renamed in server::install  - As a result of rename several underlying dependencies broke   this is to update the require dependencies
diff --git a/manifests/server/installdb.pp b/manifests/server/installdb.pp
@@ -19,7 +19,7 @@
       creates   => "${datadir}/mysql",
       logoutput => on_failure,
       path      => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-      require   => Package[$mysql::server::package_name],
+      require   => Package['mysql-server'],
     }
 
     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::package_name],
+    require  => Package['mysql-server'],
   }
 
   # only establish ordering between config file and service if

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`creates => "${datadir}/mysql",`
`20`	`20`	`logoutput => on_failure,`
`21`	`21`	`path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',`
`22`		`- require => Package[$mysql::server::package_name],`
	`22`	`+ require => Package['mysql-server'],`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if $mysql::server::restart {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`name => $mysql::server::service_name,`
`32`	`32`	`enable => $mysql::server::real_service_enabled,`
`33`	`33`	`provider => $mysql::server::service_provider,`
`34`		`- require => Package[$mysql::server::package_name],`
	`34`	`+ require => Package['mysql-server'],`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`# only establish ordering between config file and service if`