From fe3e19e17ff2d7c70cae1b948187b791fd3c29b2 Mon Sep 17 00:00:00 2001
From: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date: Fri, 13 Feb 2015 00:58:39 +0900
Subject: [PATCH] Use DevStack process functions

This allows us to run a sheep process under screen.

Change-Id: I020005671d28373c9a70291376d0637e4495493d
---
 devstack/plugin.sh | 13 ++++---------
 devstack/settings  |  3 +++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d6a1091..fbda20b 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -46,8 +46,7 @@ function check_os_support_sheepdog {
 
 # stop_sheepdog() - Stop running processes (non-screen)
 function stop_sheepdog {
-    sudo pkill -f sheep
-    sleep 3
+    stop_process sheepdog
 
     if egrep -q ${SHEEPDOG_DATA_DIR} /proc/mounts; then
         sudo umount ${SHEEPDOG_DATA_DIR}
@@ -69,6 +68,7 @@ function cleanup_sheepdog {
 function configure_sheepdog {
     # create a backing file disk
     create_disk ${SHEEPDOG_DISK_IMAGE} ${SHEEPDOG_DATA_DIR} ${SHEEPDOG_LOOPBACK_DISK_SIZE}
+    sudo chown -R ${STACK_USER}: ${SHEEPDOG_DATA_DIR}
 }
 
 # install_sheepdog() - Collect source and prepare
@@ -84,15 +84,10 @@ function install_sheepdog {
 
 # start_sheepdog() - Start running processes, including screen
 function start_sheepdog {
-    # clean up from previous (possibly aborted) runs
-    # make sure to kill all sheepdog processes first
-    sudo pkill -f sheep || true
+    run_process sheepdog "sheep -f -o -l 7 -c local ${SHEEPDOG_DATA_DIR}"
     sleep 3
 
-    sudo sheep -l 7 -c local ${SHEEPDOG_DATA_DIR}
-    sleep 3
-
-    sudo dog cluster format -c 1
+    dog cluster format -c 1
 }
 
 # configure_cinder_backend_sheepdog - Configure Cinder for Sheepdog backends
diff --git a/devstack/settings b/devstack/settings
index 4eb27e6..3dfc1b7 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,5 +1,8 @@
 # Devstack settings
 
+# we have to add sheepdog to enabled services for run_process to work
+enable_service sheepdog
+
 # enable sheepdog cinder backend
 CINDER_ENABLED_BACKENDS=sheepdog:sheepdog
 TEMPEST_STORAGE_PROTOCOL=sheepdog