commit 3f603d93c87ad200d61ec3827bb847cccd699929
author Chuck Short <chuck.short@canonical.com> Sat Jul 28 13:28:33 2012 -0500
committer Chuck Short <chuck.short@canonical.com> Tue Jul 31 15:50:58 2012 -0500
tree 68096bdfda7bf99a8944d589a00fc0870f0260ca
parent 14ab37eb4174b8a1be8c5ff5e531cff5db3791c9

Setup tgtd configuration files

Setup devstack to use tgtd confiuration files.

Change-Id: Icb2a1a0c5ca517604f9a3930e7c89e3be9a36b0c
Signed-off-by: Chuck Short <chuck.short@canonical.com>

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 0e42600..49ad4af 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -142,6 +142,8 @@
             if ! sudo vgs $VOLUME_GROUP; then sudo vgcreate $VOLUME_GROUP $DEV; fi
         fi
 
+        mkdir -p $CINDER_DIR/volumes
+
         if sudo vgs $VOLUME_GROUP; then
             if [[ "$os_PACKAGE" = "rpm" ]]; then
                 # RPM doesn't start the service
@@ -171,6 +173,9 @@
 function start_cinder() {
     if is_service_enabled c-vol; then
         if [[ "$os_PACKAGE" = "deb" ]]; then
+            if [[ ! -f /etc/tgt/conf.d/cinder.conf ]]; then
+               echo "include $CINDER_DIR/volumes/*" | sudo tee /etc/tgt/conf.d/cinder.conf
+            fi
             # tgt in oneiric doesn't restart properly if tgtd isn't running
             # do it in two steps
             sudo stop tgt || true