Browse code
Fix Swift config for Ceilometer usage
Ceilometer filter was previously removed from the Swift
configuration to avoid useless Ceilometer logs in the Swift
ones. This was fixed by setting only warning log level for
this Ceilometer part of the pipeline to keep only important
ones.
that is needed in stable/icehouse to allow swift+ceilometer
in devstack and devstack gate (otherwise grenade job, that is
using stable/icehouse devstack, won't pass the gate)
Change-Id: I8c41355bb98dbf3bb59ec792221b05ea936086b7
Partial-Bug: #1294789
(cherry picked from commit eedfdee060b17d38b14628b7e706967cb15a35af)
Dina Belova authored on 2014/06/24 21:52:46Showing 1 changed files
| ... | ... |
@@ -334,12 +334,12 @@ function configure_swift {
|
| 334 | 334 |
iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server node_timeout 120
|
| 335 | 335 |
iniset ${SWIFT_CONFIG_PROXY_SERVER} app:proxy-server conn_timeout 20
|
| 336 | 336 |
|
| 337 |
- # Skipped due to bug 1294789 |
|
| 338 |
- ## Configure Ceilometer |
|
| 339 |
- #if is_service_enabled ceilometer; then |
|
| 340 |
- # iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift"
|
|
| 341 |
- # SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"
|
|
| 342 |
- #fi |
|
| 337 |
+ # Configure Ceilometer |
|
| 338 |
+ if is_service_enabled ceilometer; then |
|
| 339 |
+ iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer "set log_level" "WARN"
|
|
| 340 |
+ iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer use "egg:ceilometer#swift"
|
|
| 341 |
+ SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"
|
|
| 342 |
+ fi |
|
| 343 | 343 |
|
| 344 | 344 |
# Restrict the length of auth tokens in the swift proxy-server logs. |
| 345 | 345 |
iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:proxy-logging reveal_sensitive_prefix ${SWIFT_LOG_TOKEN_LENGTH}
|