python-cinder: Move tgt config files to avoid conflicts

We might have the following warning and error since both tgt and python-
cinder create /etc/tgt/targets.conf. This patch creates conf.d/ under
/etc/tgt/ and puts python-cinder's config file there. tgt's config file
will include it automatically.

warning: Removing tgt-1.0.63+git0+eca74a72d2-r0.0@corei7_64 due to
file /etc/tgt/targets.conf conflicting with
python-cinder-7.0.0+git0+61026d4e4f-r0.0@corei7_64
error: tgt-dev-1.0.63+git0+eca74a72d2-r0.0 requires tgt =
1.0.63+git0+eca74a72d2-r0.0

Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 7e689e7..3203c43 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -109,8 +109,8 @@ do_install_append() {
 
     #Create cinder volume group backing file
     sed 's/%CINDER_LVM_VOLUME_BACKING_FILE_SIZE%/${CINDER_LVM_VOLUME_BACKING_FILE_SIZE}/g' -i ${D}/etc/cinder/drivers/lvm_iscsi_setup.sh
-    mkdir -p ${D}/etc/tgt/
-    echo "include /etc/cinder/data/volumes/*" > ${D}/etc/tgt/targets.conf
+    mkdir -p ${D}/etc/tgt/conf.d/
+    echo "include /etc/cinder/data/volumes/*" > ${D}/etc/tgt/conf.d/python-cinder.conf
 
     # Create Cinder nfs_share config file with default nfs server
     echo "${CINDER_NFS_VOLUME_SERVERS}" > ${D}/etc/cinder/nfs_shares