Build from master

[openstack-build/cinder-build.git] / rpm / SOURCES / openstack-cinder-volume.init

diff --git a/rpm/SOURCES/openstack-cinder-volume.init b/rpm/SOURCES/openstack-cinder-volume.init
index 1ca1a8e902fa8ab98d6f90f8b1cba31a12f989e8..896c6b3983b6bf1a522045c3f0174684a049ef95 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-volume.init
+++ b/rpm/SOURCES/openstack-cinder-volume.init
@@ -28,6 +28,7 @@ suffix=volume
 prog=openstack-cinder-$suffix
 exec="/usr/bin/cinder-$suffix"
 config="/etc/cinder/cinder.conf"
+distconfig="/usr/share/cinder/cinder-dist.conf"
 pidfile="/var/run/cinder/cinder-$suffix.pid"
 logfile="/var/log/cinder/$suffix.log"
 
@@ -39,7 +40,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user cinder --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user cinder --pidfile $pidfile "$exec --config-file $distconfig --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile