From: Thomas Goirand <thomas@goirand.fr>
Date: Mon, 24 Jun 2013 07:10:28 +0000 (+0800)
Subject: Added cinder-volume CEPH_ARGS export using what is configured in /etc/default/cinder... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=09abe62989eedc458a205e5edce0e046b966a0e6;p=openstack-build%2Fcinder-build.git

Added cinder-volume CEPH_ARGS export using what is configured in /etc/default/cinder-volume.
---

diff --git a/debian/changelog b/debian/changelog
index 781b26c3a..cdcfba99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cinder (2013.1.2-2) UNRELEASED; urgency=low
 
   * Starts Cinder after postgresql, mysql, keystone, rabbitmq-server and ntp.
+  * Added cinder-volume CEPH_ARGS export using what is configured in
+    /etc/default/cinder-volume.
 
  -- Thomas Goirand <zigo@debian.org>  Sat, 22 Jun 2013 16:27:46 +0800
 
diff --git a/debian/cinder-volume.init b/debian/cinder-volume.init
index d45c48cf9..db398bdc0 100644
--- a/debian/cinder-volume.init
+++ b/debian/cinder-volume.init
@@ -29,6 +29,13 @@ DEFAULTS_FILE=/etc/default/cinder-common
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 
+if [ -r /etc/default/cinder-volume ] ; then
+	. /etc/default/cinder-volume
+fi
+if [ -n "${CEPH_ARGS_EXPORT}" ] ; then
+	export CEPH_ARGS=${CEPH_ARGS_EXPORT}
+fi
+
 mkdir -p ${LOCK_DIR}
 chown ${CINDER_USER} ${LOCK_DIR}