Merge "Detect missing packages with yum"
diff --git a/extras.d/80-opendaylight.sh b/extras.d/80-opendaylight.sh
index cc5c8de..57b4328 100644
--- a/extras.d/80-opendaylight.sh
+++ b/extras.d/80-opendaylight.sh
@@ -1,7 +1,9 @@
# opendaylight.sh - DevStack extras script
-# Need this first to get the is_***_enabled for ODL
-source $TOP_DIR/lib/opendaylight
+if is_service_enabled odl-server odl-compute; then
+ # Initial source
+ [[ "$1" == "source" ]] && source $TOP_DIR/lib/opendaylight
+fi
if is_service_enabled odl-server; then
if [[ "$1" == "source" ]]; then
diff --git a/lib/swift b/lib/swift
index b8bc1b6..b655440 100644
--- a/lib/swift
+++ b/lib/swift
@@ -67,8 +67,8 @@
SWIFT_LOOPBACK_DISK_SIZE=${SWIFT_LOOPBACK_DISK_SIZE:-$SWIFT_LOOPBACK_DISK_SIZE_DEFAULT}
# Set ``SWIFT_EXTRAS_MIDDLEWARE`` to extras middlewares.
-# Default is ``staticweb, tempurl, formpost``
-SWIFT_EXTRAS_MIDDLEWARE=${SWIFT_EXTRAS_MIDDLEWARE:-tempurl formpost staticweb}
+# Default is ``staticweb, formpost``
+SWIFT_EXTRAS_MIDDLEWARE=${SWIFT_EXTRAS_MIDDLEWARE:-formpost staticweb}
# Set ``SWIFT_EXTRAS_MIDDLEWARE_LAST`` to extras middlewares that need to be at
# the end of the pipeline.