Updating mysql module

diff --git a/manifests/master.pp b/manifests/master.pp
index 715487de395ded65b7a77de8a5e0c24c67c603f7..df1f7d973c050ee326c5c9a611ce08904f6623b9 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -41,9 +41,6 @@ class nodo::master {
     ensure => absent,
   }
 
-  # For storeconfigs
-  include mysql::server
-
   case $master_db_password {
     '': { fail("Please set nodo::master::db_password in your config") }
   }

diff --git a/manifests/subsystems/database.pp b/manifests/subsystems/database.pp
index 5df970018581a942f0556cc0dfd5d62e6c040a1c..7cc7a29978aae004a2e6dbfb8494c0d258983bf4 100644 (file)
--- a/manifests/subsystems/database.pp
+++ b/manifests/subsystems/database.pp
@@ -1,5 +1,5 @@
 class database {
-  include mysql::server
+  class { 'mysql::server': }
 
   # See http://www.smilecouple.org/2011/03/01/fix-out-of-resource-problem-with-mysql
   file { '/etc/security/limits.d/mysql.conf':