From c6cc585f9740fdf98d7068e0269f7ba8276cb24a Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Tue, 25 Sep 2012 18:16:59 +0100
Subject: [PATCH] Ensure correct cinder dir is written to tgt config

The wrong directory was being placed in the tgtd config.

This change will allow https://review.openstack.org/13633 to gate.

Change-Id: Icbf7b5ecc9bc53ccc2aed0cacb9f5f61abe8f882
---
 lib/cinder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cinder b/lib/cinder
index 14c2df8b3f..08c840e8dc 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -208,7 +208,7 @@ function start_cinder() {
         if [[ "$os_PACKAGE" = "deb" ]]; then
             _configure_tgt_for_config_d
             if [[ ! -f /etc/tgt/conf.d/cinder.conf ]]; then
-               echo "include $CINDER_DIR/volumes/*" | sudo tee /etc/tgt/conf.d/cinder.conf
+               echo "include $CINDER_STATE_PATH/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