commit c856f51ed735b6574b1570af8468d493ef7e17f4
author Jenkins <jenkins@review.openstack.org> Sun Jul 13 15:09:50 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jul 13 15:09:51 2014 +0000
tree 071a7978403b1707b7d7c7f092a5da6a06c074f6
parent d727754c921676b9fe66162ee39ca854f3bea691
parent eedfdee060b17d38b14628b7e706967cb15a35af

Merge "Fix Swift config for Ceilometer usage"

lib/swift

diff --git a/lib/swift b/lib/swift
index b01dd95..2b161c3 100644
--- a/lib/swift
+++ b/lib/swift
@@ -339,12 +339,12 @@
     iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server node_timeout 120
     iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server conn_timeout 20
 
-    # Skipped due to bug 1294789
-    ## Configure Ceilometer
-    #if is_service_enabled ceilometer; then
-    #    iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift"
-    #    SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"
-    #fi
+    # 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"
+        SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"
+    fi
 
     # Restrict the length of auth tokens in the swift proxy-server logs.
     iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:proxy-logging reveal_sensitive_prefix ${SWIFT_LOG_TOKEN_LENGTH}