Merge "Remove security info from log output if not development mode"

This commit is contained in:
Jenkins 2016-04-29 10:27:39 +00:00 committed by Gerrit Code Review
commit ec1b92a973
1 changed files with 14 additions and 1 deletions

View File

@ -20,6 +20,7 @@ from __future__ import print_function
import os
import sys
import unittest2
import yaml
import keystoneclient
try:
@ -425,6 +426,8 @@ FuelConf = [
default=False,
help='ssl usage'),
cfg.BoolOpt('ssl_data',
default=False),
cfg.BoolOpt('development_mode',
default=False)
]
@ -591,6 +594,13 @@ class NailgunConfig(object):
if parse:
self.prepare_config()
@property
def development_mode(self):
with open('/etc/nailgun/settings.yaml') as nailgun_opts:
nailgun_settings = yaml.safe_load(nailgun_opts)
self.fuel.development_mode = nailgun_settings['DEVELOPMENT']
return nailgun_settings['DEVELOPMENT']
def prepare_config(self, *args, **kwargs):
try:
self._parse_meta()
@ -619,7 +629,10 @@ class NailgunConfig(object):
response = self.req_session.get(self.nailgun_url + api_url)
LOG.info('RESPONSE %s STATUS %s' % (api_url, response.status_code))
data = response.json()
LOG.info('RESPONSE FROM %s - %s' % (api_url, data))
if self.development_mode:
LOG.info('RESPONSE FROM %s - %s' % (api_url, data))
access_data = data['editable']['access']
common_data = data['editable']['common']