aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:06:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:06:32 -0200
commit86d03609aa0e8cafdce86a0e3d5734518cbf8071 (patch)
tree8dfcbae747f9dc8e4479f59123c82ef70210eed5
parent01043b1dd2e7f6931a7dd031abf12abd988fa6cb (diff)
downloadpuppet-nodo-86d03609aa0e8cafdce86a0e3d5734518cbf8071.tar.gz
puppet-nodo-86d03609aa0e8cafdce86a0e3d5734518cbf8071.tar.bz2
Updating mysql module
-rw-r--r--manifests/master.pp3
-rw-r--r--manifests/subsystems/database.pp2
2 files changed, 1 insertions, 4 deletions
diff --git a/manifests/master.pp b/manifests/master.pp
index 715487d..df1f7d9 100644
--- 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 5df9700..7cc7a29 100644
--- 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':