summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-11-04 11:00:14 -0600
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-11-25 15:25:36 -0500
commitb5fb88b0bdcea9c73b81f7f9014f7d3b4f18fd3f (patch)
tree2ed4d703c95155ef82ee69a7fffbe953a0352038
parent07a4cc7021a49149fabb332ec149a02c814e31a3 (diff)
downloadmeta-cloud-services-b5fb88b0bdcea9c73b81f7f9014f7d3b4f18fd3f.tar.gz
postgresql-init: Remove sleeps
Now that the /etc/init.d/postgresql script will start and stop the database synchronously there is no need to sleep waiting for the database to come to life or wait for it to stop. Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-rw-r--r--meta-openstack/recipes-support/postgresql/postgresql/postgresql-init3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init b/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init
index 26f858e..874f24e 100644
--- a/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init
+++ b/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init
@@ -13,13 +13,10 @@ if [ -e /etc/${PN}/PG_VERSION ]; then
13fi 13fi
14 14
15sudo -u postgres initdb -D /etc/${PN}/ 15sudo -u postgres initdb -D /etc/${PN}/
16sleep 2
17echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf 16echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf
18echo "host all all ${CONTROLLER_IP}/32 trust" >> /etc/${PN}/pg_hba.conf 17echo "host all all ${CONTROLLER_IP}/32 trust" >> /etc/${PN}/pg_hba.conf
19echo "host all all ${COMPUTE_IP}/32 trust" >> /etc/${PN}/pg_hba.conf 18echo "host all all ${COMPUTE_IP}/32 trust" >> /etc/${PN}/pg_hba.conf
20sleep 2
21/etc/init.d/postgresql start 19/etc/init.d/postgresql start
22sleep 10
23 20
24count=0 21count=0
25done=0 22done=0