From 23f50d5aeda3ff3ab96f17e04df4df7646589c58 Mon Sep 17 00:00:00 2001
From: Yifei Xue <xueyifei@huawei.com>
Date: Mon, 24 Apr 2017 11:22:40 +0800
Subject: tempest test case failed in Functest smoke

JIRA: COMPASS-545

1. LVMISCSIDriver has been removed but LVMVolumeDriver is what actually exists.
Updating the LVM driver name in cinder.conf will solve this.

2. Add tgt to cinder-volume's service list

3. Add section of ceph in cinder.conf for cinder backend

4. Add enable_backends in cinder.conf

Change-Id: I477d2b17ce9e10871a7b96c1a98a49506b36a6ef
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---
 .../ceph-openstack/tasks/ceph_openstack_conf.yml   | 42 ++++++++++++----------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'deploy/adapters/ansible/roles/ceph-openstack')

diff --git a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
index 84515267..5d9138bb 100755
--- a/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
+++ b/deploy/adapters/ansible/roles/ceph-openstack/tasks/ceph_openstack_conf.yml
@@ -56,24 +56,30 @@
         /etc/cinder/cinder.conf;
     sed -i 's/^\(rbd_secret_uuid\).*/\1 = {{ ceph_uuid }}/g' \
         /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_pool = volumes' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_ceph_conf = /etc/ceph/ceph.conf' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_flatten_volume_from_snapshot = false' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_max_clone_depth = 5' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_store_chunk_size = 4' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rados_connect_timeout = -1' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a glance_api_version = 2' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_user = cinder' \
-        /etc/cinder/cinder.conf;
-    sed -i '/^\[DEFAULT/a rbd_secret_uuid = {{ ceph_uuid }}' \
-        /etc/cinder/cinder.conf;
+    crudini --set /etc/cinder/cinder.conf DEFAULT enabled_backends \
+        ceph;
+    crudini --del /etc/cinder/cinder.conf lvm
+    crudini --set /etc/cinder/cinder.conf ceph volume_driver \
+        cinder.volume.drivers.rbd.RBDDriver;
+    crudini --set /etc/cinder/cinder.conf ceph volume_backend_name \
+        ceph;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_pool volumes;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_ceph_conf \
+        /etc/ceph/ceph.conf;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_flatten_volume_from_snapshot \
+        false;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_max_clone_depth \
+        5;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_store_chunk_size \
+        4;
+    crudini --set /etc/cinder/cinder.conf ceph rados_connect_timeout \
+        -1;
+    crudini --set /etc/cinder/cinder.conf ceph glance_api_version \
+        2;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_user \
+        cinder;
+    crudini --set /etc/cinder/cinder.conf ceph rbd_secret_uuid \
+        {{ ceph_uuid }};
   when: inventory_hostname in groups['compute']
   tags:
     - ceph_conf_cinder
-- 
cgit 1.2.3-korg