tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mysql::database::populate: require module `grep'"

Browse Source 
This reverts commit 645a2ec3804157e6958056b39b0ae1cb2c720091.

Conflicts:
	.vagrant-puppet/modules/mysql/manifests/database/populate.pp
This commit is contained in:
Alexander Klimov 2014-09-11 10:20:59 +02:00
parent dc28f53033
commit d892ae5670
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.vagrant-puppet/modules/mysql/manifests/database/populate.pp
View File

@ -12,7 +12,6 @@
# Requires: # Requires:
# #
# mysql::database::create # mysql::database::create
# grep
# #
# Sample Usage: # Sample Usage:
# #
@ -24,8 +23,6 @@
# } # }
# #
define mysql::database::populate ($username, $password, $privileges, $schemafile) { define mysql::database::populate ($username, $password, $privileges, $schemafile) {
include grep
Exec { path => '/bin:/usr/bin' } Exec { path => '/bin:/usr/bin' }
mysql::database::create { $name: mysql::database::create { $name:
@ -37,9 +34,6 @@ define mysql::database::populate ($username, $password, $privileges, $schemafile
exec { "populate-${name}-mysql-db": exec { "populate-${name}-mysql-db":
onlyif => "mysql -u${username} -p${password} ${name} -e \"SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${name}';\" 2>/dev/null |grep -qEe '^ *0 *$'", onlyif => "mysql -u${username} -p${password} ${name} -e \"SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${name}';\" 2>/dev/null |grep -qEe '^ *0 *$'",
command => "mysql -uroot ${name} < ${schemafile}", command => "mysql -uroot ${name} < ${schemafile}",
require => [ require => Mysql::Database::Create[$name],
Mysql::Database::Create[$name],
Class['grep']
],
} }
} }