commit 7d0a0f7d48222369f36a1a5a27a39c45430c9615
author Rob Crittenden <rcritten@redhat.com> Mon Nov 17 00:03:47 2014 -0500
committer Rob Crittenden <rcritten@redhat.com> Mon Nov 17 00:03:47 2014 -0500
tree a4690d1e32143dad2ffb4826b1b9b45a7ca7c148
parent 9bfdea87a6ceea667a3c674215099ce8a967a3c2

Remove hardcoded protocol from backup_swift_url

Use SWIFT_SERVICE_PROTOCOL when configuring backup_swift_url for
cinder configuration.

Change-Id: I09de62e8deca86b473cee969ba2c5919d4f9892d
Closes-Bug: #1393554

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index eb3cbe8..611e1ca 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -258,7 +258,7 @@
     fi
 
     if is_service_enabled swift; then
-        iniset $CINDER_CONF DEFAULT backup_swift_url "http://$SERVICE_HOST:8080/v1/AUTH_"
+        iniset $CINDER_CONF DEFAULT backup_swift_url "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:8080/v1/AUTH_"
     fi
 
     if is_service_enabled ceilometer; then