openstack/heat
Code Issues Proposed changes

Fix heat-keystone-setup-domain

Browse Source 
Change I4209f3bcc56467b6eb50a794694fe8d1da780161 to use oslo.log
has broken the heat-keystone-setup-domain script. This patch
fixes it.

Change-Id: Ib98a453803d9fd2bf31056e8c9b49b84b2e7e715
Closes-Bug: #1573368
This commit is contained in:
Rabi Mishra 2016-04-22 10:42:34 +05:30
parent bf18856442
commit 6b8f1ae5a6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/heat-keystone-setup-domain
View File

@ -55,6 +55,18 @@ opts = [
] ]
# Setup logging before registering additional options
logging.register_options(cfg.CONF)
extra_log_level_defaults = ['urllib3.connectionpool=WARNING']
logging.set_defaults(
logging_context_format_string="%(levelname)s (%(module)s:"
"%(lineno)d) %(message)s",
default_log_levels=(logging.get_default_log_levels() +
extra_log_level_defaults))
logging.setup(cfg.CONF, 'heat-keystone-setup-domain',
version.version_info.version_string())
# Register additional options
cfg.CONF.register_cli_opts(opts) cfg.CONF.register_cli_opts(opts)
cfg.CONF(sys.argv[1:], cfg.CONF(sys.argv[1:],
project='heat', project='heat',
@ -79,12 +91,6 @@ insecure = cfg.CONF.insecure
def main(): def main():
log_lvl = logging.DEBUG if DEBUG else logging.WARNING
logging.basicConfig(
format="%(levelname)s (%(module)s:%(lineno)d) %(message)s",
level=log_lvl)
logging.getLogger('urllib3.connectionpool').setLevel(logging.WARNING)
client_kwargs = { client_kwargs = {
'debug': DEBUG, 'debug': DEBUG,
'username': USERNAME, 'username': USERNAME,