From 1a2423ef3bbd6479135a282de28da8cfb4defe36 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 24 Jun 2013 15:10:28 +0800 Subject: [PATCH] Added cinder-volume CEPH_ARGS export using what is configured in /etc/default/cinder-volume. Rewritten-From: 09abe62989eedc458a205e5edce0e046b966a0e6 --- xenial/debian/changelog | 2 ++ xenial/debian/cinder-volume.init | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 781b26c3a..cdcfba99e 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Sat, 22 Jun 2013 16:27:46 +0800 diff --git a/xenial/debian/cinder-volume.init b/xenial/debian/cinder-volume.init index d45c48cf9..db398bdc0 100644 --- a/xenial/debian/cinder-volume.init +++ b/xenial/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} -- 2.45.2