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

diff --git a/debian/changelog b/debian/changelog
index 781b26c3ad702aedb538ff5bf514cd283c202cb5..cdcfba99e41e2ca703c25f30b1aade3b6805e063 100644 (file)
--- 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 d45c48cf9e3982843f034779862fb5d0f7ea24cd..db398bdc026838d24bfddc7b0f2a914607926568 100644 (file)
--- 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}