From ce4701f161f2359a6638c5d3691540d886f1b7ec Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 11 Oct 2013 23:01:50 +0800
Subject: [PATCH] Removes the CEPH_ARGS hack in /etc/default/cinder and
cinder-volume.init script since it's now configurable in upstream config
file.
Rewritten-From: 8009a20e325032e212ddacc2ba07ea9d2cb77561
---
xenial/debian/changelog | 8 ++++++++
xenial/debian/cinder-volume.default | 5 -----
xenial/debian/cinder-volume.init | 16 +++-------------
3 files changed, 11 insertions(+), 18 deletions(-)
delete mode 100644 xenial/debian/cinder-volume.default
diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 8fe2b9e7a..9566db72d 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,11 @@
+cinder (2013.2~rc1-3) UNRELEASED; urgency=low
+
+ * Kills the CEPH_ARGS hack in /etc/default/cinder and cinder-volume.init
+ since that's not needed anymore (upstream code manages this now in the
+ configuration file directly).
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Oct 2013 22:54:46 +0800
+
cinder (2013.2~rc1-2) experimental; urgency=low
* Updates the templates and translations to really (Closes: #708658).
diff --git a/xenial/debian/cinder-volume.default b/xenial/debian/cinder-volume.default
deleted file mode 100644
index a4ec89943..000000000
--- a/xenial/debian/cinder-volume.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# This controls the values to export for Ceph
-# If it's not defined, then nothing will happen.
-# If it is, then export CEPH_ARGS will use the content
-# of the below variable.
-CEPH_ARGS_EXPORT="--id nova"
diff --git a/xenial/debian/cinder-volume.init b/xenial/debian/cinder-volume.init
index a66378bfa..d45c48cf9 100755
--- a/xenial/debian/cinder-volume.init
+++ b/xenial/debian/cinder-volume.init
@@ -29,10 +29,6 @@ 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
-
mkdir -p ${LOCK_DIR}
chown ${CINDER_USER} ${LOCK_DIR}
@@ -55,15 +51,9 @@ do_start()
{
start-stop-daemon --start --quiet --background --chuid ${CINDER_USER}:cinder --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
|| return 1
- if [ -n "${CEPH_ARGS_EXPORT}" ] ; then
- CEPH_ARGS="${CEPH_ARGS_EXPORT}" start-stop-daemon --start --quiet --background --chuid ${CINDER_USER}:cinder --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- else
- start-stop-daemon --start --quiet --background --chuid ${CINDER_USER}:cinder --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
- fi
+ start-stop-daemon --start --quiet --background --chuid ${CINDER_USER}:cinder --make-pidfile --pidfile $PIDFILE --startas $DAEMON -- \
+ $DAEMON_ARGS \
+ || return 2
}
do_stop()
--
2.45.2