commit 51a4c28b028df00268baf3c911281d5364d349f1
author Jenkins <jenkins@review.openstack.org> Wed Jun 28 23:19:25 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 28 23:19:25 2017 +0000
tree 7daceef308e7ed9c12f640e9e7e4770822ff2a9e
parent 9c39cb68df5d6ea8241669813529866da8c1ecfc
parent 2c0faca0380050b697b7d7fe6589102fa8a0cb5d

Merge "Add devstack-version script"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 243b639..998784b 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -313,7 +313,6 @@
         # Set the service port for a proxy to take the original
         iniset $CINDER_CONF DEFAULT osapi_volume_listen_port $CINDER_SERVICE_PORT_INT
         iniset $CINDER_CONF DEFAULT public_endpoint $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT
-        iniset $CINDER_CONF DEFAULT osapi_volume_base_URL $CINDER_SERVICE_PROTOCOL://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT
     fi
 
     if [ "$SYSLOG" != "False" ]; then