1 files changed, 13 insertions, 26 deletions

diff --git a/meta-openstack/recipes-support/deploychef/files/service-shutdown b/meta-openstack/recipes-support/deploychef/files/service-shutdown
index b89f9fa..00b571f 100644
--- a/meta-openstack/recipes-support/deploychef/files/service-shutdown
+++ b/meta-openstack/recipes-support/deploychef/files/service-shutdown
@@ -22,33 +22,20 @@
 # THE SOFTWARE.
 #
 #
-INITD_DIR=/etc/init.d/
-services=$(cat %DEPLOYCHEF_ROOT_DIR%/shutdown-list)
-for service in $services; do
-    service=$(echo $service | awk -F'K..' '{print $2}')
-    if [ -e $INITD_DIR$service ]; then
-        $INITD_DIR$service stop
-        sleep 1
-    fi
-done
+source /opt/deploychef/deploychef-inc
 
+make_log_dir
+start_stop_services 'shutdown-list'
 #Clean up swift installation and all stale files
-/etc/swift/swift_setup.sh clean
-
-#Delete all the know data base entries
-databases="ceilometer cinder glance heat keystone nova ovs_neutron \
-    postgres"
-for database in $databases; do
-    sudo -u postgres dropdb $database
-    sleep 1
-done
-
-#Now shutdown postgres and database directory
-if [ -e ${INITD_DIR}postgresql ]; then
-    ${INITD_DIR}postgresql stop
-    killall postgres
-    sleep 1
-    rm -rf /etc/postgresql
-    sleep 1
+if [ -f /etc/swift/swift_setup.sh ]; then
+    /etc/swift/swift_setup.sh clean
+fi
+#Now stop postgresql and delete database directory
+if [ -e ${INITD_DIR}/postgresql ]; then
+    ${INITD_DIR}/postgresql stop
+    killall postgres &
+    wait
+    rm -rf /etc/postgresql &
+    wait
 fi