Revert "802346 - wait for postgres to come up in puppet"

This reverts commit caef237.

This is thowing error:

err: Could not apply complete catalog: Found dependency cycles in the
following relationships:

http://lzap.fedorapeople.org/projects/katello/graphs/puppet_of_0.2_13.png

Reverting, not sure what is wrong now.

puppet/modules/postgres/manifests/config.pp

@@ -16,17 +16,6 @@
       notify  => Service["postgresql"],
       require => Exec["InitDB"];
   }
-
-  # wait 30 seconds for postgresql daemon to accept connections and execute SQL commands or timeout when not running
-  exec { "wait-for-postgresql":
-    environment => "PGCONNECT_TIMEOUT=5",
-    path        => "/usr/bin:/bin",
-    command     => "bash -c \"for i in {1..7}; do psql -U ${postgres::params::user} -h localhost -c 'select count(*) from pg_tables' >/dev/null 2>&1 || sleep 5; done\"",
-    timeout     => 30, # loop above is for 35 secs max but we timeout after 30
-    user        => $postgres::params::user,
-    require     => Class["postgres::service"],
-  }
-
   exec { "InitDB":
     command => $postgres::params::password ? {
       ""      => "/usr/bin/initdb ${postgres::params::home}//data -E UTF8",

puppet/modules/postgres/manifests/createdb.pp

@@ -6,7 +6,7 @@
     database => "postgres",
     sql => "CREATE DATABASE $name WITH OWNER = $owner ENCODING = 'UTF8';",
     sqlcheck => "\"SELECT datname FROM pg_database WHERE datname ='$name'\" | grep $name",
-    require  => Exec["wait-for-postgresql"],
+    require  => Class["postgres::service"],
     logfile  => $logfile,
   }
 }

puppet/modules/postgres/manifests/createuser.pp

@@ -6,7 +6,7 @@
     database => "postgres",
     sql      => "CREATE ROLE ${name} WITH LOGIN PASSWORD '${passwd}' ${roles};",
     sqlcheck => "\"SELECT usename FROM pg_user WHERE usename = '${name}'\" | grep ${name}",
-    require  => Exec["wait-for-postgresql"],
+    require  => Class["postgres::service"],
     logfile  => $logfile,
   }
 

puppet/modules/postgres/manifests/sqlexec.pp

@@ -8,6 +8,6 @@
     path        => $path,
     timeout     => 600,
     unless      => "psql -U $username $database -c $sqlcheck",
-    require     => Exec["wait-for-postgresql"],
+    require     => Class["postgres::service"],
   }
 }