From dc28f53033ebbef16f3fe9e8c2b6f76677952f6b Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Thu, 11 Sep 2014 10:18:18 +0200
Subject: [PATCH] Revert "pgsql::database::populate: require module `grep'"

This reverts commit 9bb68c42a0169220d92a6c3408c7416f90529877.

Conflicts:
	.vagrant-puppet/modules/pgsql/manifests/database/populate.pp
---
 .../modules/pgsql/manifests/database/populate.pp          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.vagrant-puppet/modules/pgsql/manifests/database/populate.pp b/.vagrant-puppet/modules/pgsql/manifests/database/populate.pp
index 03950f281..8663ff3f1 100644
--- a/.vagrant-puppet/modules/pgsql/manifests/database/populate.pp
+++ b/.vagrant-puppet/modules/pgsql/manifests/database/populate.pp
@@ -11,7 +11,6 @@
 # Requires:
 #
 #   pgsql::database::create
-#   grep
 #
 # Sample Usage:
 #
@@ -22,8 +21,6 @@
 # }
 #
 define pgsql::database::populate ($username, $password, $schemafile) {
-  include grep
-
   Exec { path => '/bin:/usr/bin' }
 
   pgsql::database::create { $name:
@@ -35,9 +32,6 @@ define pgsql::database::populate ($username, $password, $schemafile) {
     onlyif  => "psql -U ${username} -d ${name} -c \"SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${name}';\" 2>/dev/null |grep -qEe '^ *0 *$'",
     command => "psql -U ${username} -d ${name} < ${schemafile}",
     user    => 'postgres',
-    require => [
-      Pgsql::Database::Create[$name],
-      Class['grep']
-    ],
+    require => Pgsql::Database::Create[$name],
   }
 }