commit 0054d9242e54ca72aca2a72def9baea03e12166e
author Jenkins <jenkins@review.openstack.org> Fri Jan 31 20:20:34 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 31 20:20:34 2014 +0000
tree 933156ff082e85251596d9e02e89e42db29de09c
parent 5c5af45be1c08150579ecf7b9842a0c075511f80
parent 315f7b0747effbd490ff3b25d85bc6399ed290a1

Merge "Use service postgresql initdb with el6"

lib/databases/postgresql

diff --git a/lib/databases/postgresql b/lib/databases/postgresql
index 60e5a33..c459feb 100644
--- a/lib/databases/postgresql
+++ b/lib/databases/postgresql
@@ -43,7 +43,13 @@
     if is_fedora; then
         PG_HBA=/var/lib/pgsql/data/pg_hba.conf
         PG_CONF=/var/lib/pgsql/data/postgresql.conf
-        sudo [ -e $PG_HBA ] || sudo postgresql-setup initdb
+        if ! sudo [ -e $PG_HBA ]; then
+            if ! [[ $DISTRO =~ (rhel6) ]]; then
+                sudo postgresql-setup initdb
+            else
+                sudo service postgresql initdb
+            fi
+        fi
     elif is_ubuntu; then
         PG_DIR=`find /etc/postgresql -name pg_hba.conf|xargs dirname`
         PG_HBA=$PG_DIR/pg_hba.conf