@@ -322,6 +322,8 @@ function install_ceilometermiddleware {

     if use_library_from_git "ceilometermiddleware"; then

         git_clone_by_name "ceilometermiddleware"

         setup_dev_lib "ceilometermiddleware"

+    else

+        pip_install ceilometermiddleware

     fi

 }

@@ -233,6 +233,15 @@ function restart_rpc_backend {

     fi

 }

+# builds transport url string

+function get_transport_url {

+    if is_service_enabled qpid || [ -n "$QPID_HOST" ]; then

+        echo "qpid://$QPID_USERNAME:$QPID_PASSWORD@$QPID_HOST:5672/"

+    elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then

+        echo "rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/"

+    fi

+}

+

 # iniset cofiguration

 function iniset_rpc_backend {

     local package=$1

@@ -378,7 +378,11 @@ function configure_swift {

     # Configure Ceilometer

     if is_service_enabled ceilometer; then

         iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer "set log_level" "WARN"

-        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift"

+        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer paste.filter_factory "ceilometermiddleware.swift:filter_factory"

+        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer control_exchange "swift"

+        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer url $(get_transport_url)

+        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer driver "messaging"

+        iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer topic "notifications"

         SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"

     fi

@@ -739,6 +739,9 @@ if is_service_enabled keystone; then

 fi

 if is_service_enabled s-proxy; then

+    if is_service_enabled ceilometer; then

+        install_ceilometermiddleware

+    fi

     stack_install_service swift

     configure_swift