From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Fri, 7 Aug 2015 14:12:43 +0000 (+0300)
Subject: Fix double [DEFAULT] within config generation
X-Git-Tag: mos-9.0~11
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=606880f30c8b49bb4355ff05143b3637cfcf86fc;p=openstack-build%2Fcinder-build.git

Fix double [DEFAULT] within config generation

* add old cinder.conf

Change-Id: I10869006588b3387ddf01421eb0f598e7ab5da1b
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a38de631b..b6c178b23 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+cinder (1:2015.1.1-1~u14.04+mos1) mos7.0; urgency=medium
+
+  * Fix double [DEFAULT] within config generation
+
+ -- Igor Yozhikov <iyozhikov@mirantis.com>  Fri, 07 Aug 2015 17:02:59 +0300
+
 cinder (1:2015.1.0-1~u14.04+mos6) mos7.0; urgency=medium
 
   * Fix build and runtime dependencies
diff --git a/trusty/debian/cinder-common.install b/trusty/debian/cinder-common.install
index d9d3e8456..ee33f7516 100644
--- a/trusty/debian/cinder-common.install
+++ b/trusty/debian/cinder-common.install
@@ -1,3 +1,4 @@
+debian/cinder.conf etc/cinder
 etc/cinder/api-paste.ini etc/cinder
 etc/cinder/policy.json etc/cinder
 etc/cinder/rootwrap.conf etc/cinder
diff --git a/trusty/debian/cinder-common.postinst b/trusty/debian/cinder-common.postinst
index 3fa8dbc1b..fbea5f390 100644
--- a/trusty/debian/cinder-common.postinst
+++ b/trusty/debian/cinder-common.postinst
@@ -79,14 +79,11 @@ if [ "$1" = "configure" ]; then
         oslo-config-generator \
         --namespace oslo_concurrency --namespace oslo_db \
         --namespace oslo_messaging --namespace policy \
-        --namespace keystonemiddleware.auth_token  >> /etc/cinder/cinder.conf.sample
+        --namespace keystonemiddleware.auth_token \
+        | sed '/^\[DEFAULT/d' >> /etc/cinder/cinder.conf.sample
 
     if [ "$?" -ne 0 ]; then
-        echo "cinder configuration file generation fails!"
-    fi
-
-    if [ ! -f "/etc/cinder/cinder.conf" ]; then
-        cp /etc/cinder/cinder.conf.sample /etc/cinder/cinder.conf
+        echo "cinder sample configuration file generation fails!"
     fi
 
     if [ -e /var/lib/cinder/cinder.sqlite ]; then
diff --git a/trusty/debian/cinder.conf b/trusty/debian/cinder.conf
new file mode 100644
index 000000000..709403356
--- /dev/null
+++ b/trusty/debian/cinder.conf
@@ -0,0 +1,11 @@
+[DEFAULT]
+rootwrap_config = /etc/cinder/rootwrap.conf
+api_paste_confg = /etc/cinder/api-paste.ini
+iscsi_helper = tgtadm
+volume_name_template = volume-%s
+volume_group = cinder-volumes
+verbose = True
+auth_strategy = keystone
+state_path = /var/lib/cinder
+lock_path = /var/lock/cinder
+volumes_dir = /var/lib/cinder/volumes