diff options
| author | Steven Hardy <shardy@redhat.com> | 2014-10-22 11:37:12 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2014-10-23 18:14:55 +0100 |
| commit | 3a1cd7c8935f0bf05fd505805de7f414a9e4f775 (patch) | |
| tree | 681c3172e1551390dc617c7e79f3c2abd3e9781f /etc | |
| parent | c43107522ccd03188ba584bf949c9895642dbd36 (diff) | |
| download | heat-3a1cd7c8935f0bf05fd505805de7f414a9e4f775.tar.gz | |
sync oslo-incubator for request_id shim
Sync 838a2a3 oslo-incubator to get the new request_id shim, so
can introduce a deprecation warning that tells operators upgrading
from Juno that their paste.ini files need to point to oslo.middleware
This also syncs all other modules, except policy, which looks like it
needs some changes to heat thus will be handled via another patch.
Note we shouldn't remove this request_id shim until after Kilo is
branched.
Change-Id: I35125ffa263b0522ff6dd0b80b0beb3cbc79999b
Related-Bug: #1380629
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/heat.conf.sample | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index c14c6051d..4dbdf95c2 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -451,7 +451,7 @@ #logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s # List of logger=LEVEL pairs. (list value) -#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN +#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN # Enables or disables publication of error events. (boolean # value) @@ -462,11 +462,11 @@ #fatal_deprecations=false # The format for an instance that is passed with the log -# message. (string value) +# message. (string value) #instance_format="[instance: %(uuid)s] " # The format for an instance UUID that is passed with the log -# message. (string value) +# message. (string value) #instance_uuid_format="[instance: %(uuid)s] " # The name of a logging configuration file. This file is |