From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 9 Oct 2012 15:41:23 +0000 (+0000)
Subject: Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=18493501372db9a842e832f34554ec56dc6b6ec8;p=openstack-build%2Fcinder-build.git

Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf

Rewritten-From: a2db1a0e0160f1ef5adf18019913913ee91a4f77
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 746a4a3e9..8a744ce20 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,7 +1,11 @@
 cinder (2012.2-1) experimental; urgency=low
 
+  [ Mehdi Abaakouk ]
   * New upstream release 2012.2
 
+  [ Thomas Goirand ]
+  * Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf.
+
  -- Mehdi Abaakouk <sileht@sileht.net>  Sat, 29 Sep 2012 09:23:22 +0200
 
 cinder (2012.2~rc1+git1~6b31057-1) experimental; urgency=low
diff --git a/xenial/debian/cinder-common.install b/xenial/debian/cinder-common.install
index 6d744e2a7..0a443618c 100644
--- a/xenial/debian/cinder-common.install
+++ b/xenial/debian/cinder-common.install
@@ -4,6 +4,6 @@ etc/cinder/policy.json etc/cinder
 etc/cinder/api-paste.ini etc/cinder
 etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d
 etc/cinder/rootwrap.conf etc/cinder
-debian/cinder.conf etc/cinder
+debian/cinder.conf usr/share/cinder-common
 debian/logging.conf etc/cinder
 debian/cinder_sudoers etc/sudoers.d
diff --git a/xenial/debian/cinder-common.postinst b/xenial/debian/cinder-common.postinst
index b14acec5c..5b6b51ca8 100644
--- a/xenial/debian/cinder-common.postinst
+++ b/xenial/debian/cinder-common.postinst
@@ -12,10 +12,10 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 
     # Create config files if they don't exist
     if ! [ -d /etc/cinder ] ; then
-        mkdir /etc/cinder
+        mkdir -p /etc/cinder
     fi
     if ! [ -e /etc/cinder/cinder.conf ] ; then
-        cp /usr/share/doc/cinder-common/cinder.conf.dist /etc/cinder/cinder.conf
+        cp /usr/share/cinder-common/cinder.conf /etc/cinder/cinder.conf
     fi
 
     chown -R cinder:adm /var/log/cinder
diff --git a/xenial/debian/cinder-common.postrm b/xenial/debian/cinder-common.postrm
index 26e023532..b2335705f 100644
--- a/xenial/debian/cinder-common.postrm
+++ b/xenial/debian/cinder-common.postrm
@@ -23,6 +23,7 @@ fi
 
 if [ "$1" = "purge" ] ; then
     rm -f /etc/cinder/cinder.conf
+    rmdir --ignore-fail-on-non-empty /etc/cinder
     rm -f /etc/default/cinder-common
     rm -rf /var/lib/cinder
 fi