openstack/deb-heat
Code Issues Proposed changes

Merge "Add log output about HTTP calls in cinderclient"

Browse Source
This commit is contained in:
Jenkins 2014-08-18 01:33:02 +00:00 committed by Gerrit Code Review
commit c59f659b10
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/heat/heat.conf.sample
View File

@ -630,6 +630,14 @@
#insecure=false #insecure=false
#
# Options defined in heat.common.config
#
# Allow client's debug log output. (boolean value)
#http_log_debug=false
[clients_glance] [clients_glance]
# #

5
heat/common/config.py
View File

@ -180,7 +180,7 @@ heat_client_opts = [
help=_('Optional heat url in format like' help=_('Optional heat url in format like'
' http://0.0.0.0:8004/v1/%(tenant_id)s.'))] ' http://0.0.0.0:8004/v1/%(tenant_id)s.'))]
nova_client_opts = [ client_http_log_debug_opts = [
cfg.BoolOpt('http_log_debug', cfg.BoolOpt('http_log_debug',
default=False, default=False,
help=_("Allow client's debug log output."))] help=_("Allow client's debug log output."))]
@ -210,7 +210,8 @@ def list_opts():
yield client_specific_group, clients_opts yield client_specific_group, clients_opts
yield 'clients_heat', heat_client_opts yield 'clients_heat', heat_client_opts
yield 'clients_nova', nova_client_opts yield 'clients_nova', client_http_log_debug_opts
yield 'clients_cinder', client_http_log_debug_opts
cfg.CONF.register_group(paste_deploy_group) cfg.CONF.register_group(paste_deploy_group)

2
heat/engine/clients/os/cinder.py
View File

@ -32,6 +32,8 @@ class CinderClientPlugin(client_plugin.ClientPlugin):
'username': None, 'username': None,
'api_key': None, 'api_key': None,
'endpoint_type': endpoint_type, 'endpoint_type': endpoint_type,
'http_log_debug': self._get_client_option('cinder',
'http_log_debug'),
'cacert': self._get_client_option('cinder', 'ca_file'), 'cacert': self._get_client_option('cinder', 'ca_file'),
'insecure': self._get_client_option('cinder', 'insecure') 'insecure': self._get_client_option('cinder', 'insecure')
} }