commit 22f747b8df023dd74808df097f5fa5a92168f620
author Falk Reimann <falk.reimann@sap.com> Fri Aug 28 12:40:19 2015 +0200
committer Falk Reimann <falk.reimann@sap.com> Fri Oct 23 09:19:32 2015 +0200
tree 40168aa34df503f2e5971a8509c8f61a762bd04d
parent 897d116a7c9c09385e7e87e1202d7fa612802c49

Use swift port variable in keystone and cinder

This patch alows specifiying a deviation of the swift default port 8080 with
variable SWIFT_DEFAULT_BIND_PORT. The created endpoints in keystone for
object-store and the backup_swift_url in cinder.conf will use variable
SWIFT_DEFAULT_BIND_PORT instead of the fixed port 8080.

Change-Id: I47bbcf77368c430718fb8f29b7de1ff305e64422
Closes-Bug: #1489767

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index e5ed2db..2ed02e8 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -256,7 +256,7 @@
     fi
 
     if is_service_enabled swift; then
-        iniset $CINDER_CONF DEFAULT backup_swift_url "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/AUTH_"
+        iniset $CINDER_CONF DEFAULT backup_swift_url "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_"
     fi
 
     if is_service_enabled ceilometer; then