airship/drydock
Code Issues Proposed changes

Update some references to old configuration object

Browse Source
This commit is contained in:
Scott Hussey 2017-06-21 12:57:33 -05:00
parent 5833eeac4f
commit 2a6b9560f5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drydock_provisioner/control/middleware.py
View File

@ -16,7 +16,7 @@ import falcon
import logging
import uuid
import drydock_provisioner
import drydock_provisioner.config as config
class AuthMiddleware(object):
@ -66,7 +66,7 @@ class ContextMiddleware(object):
requested_logging = req.get_header('X-Log-Level')
if (drydock_provisioner.conf.logging.log_level == 'DEBUG' or
if (config.conf.logging.log_level == 'DEBUG' or
(requested_logging == 'DEBUG' and 'admin' in ctx.roles)):
ctx.set_log_level('DEBUG')
elif requested_logging == 'INFO':
@ -79,7 +79,7 @@ class ContextMiddleware(object):
class LoggingMiddleware(object):
def __init__(self):
self.logger = logging.getLogger(drydock_provisioner.conf.logging.control_logger_name)
self.logger = logging.getLogger(config.conf.logging.control_logger_name)
def process_response(self, req, resp, resource, req_succeeded):
ctx = req.context

2
drydock_provisioner/drivers/node/maasdriver/driver.py
View File

@ -46,7 +46,7 @@ class MaasNodeDriver(NodeDriver):
def __init__(self, **kwargs):
super(MaasNodeDriver, self).__init__(**kwargs)
config.conf.register_opts(maasdriver_options, group='maasdriver')
config.conf.register_opts(MaasNodeDriver.maasdriver_options, group=MaasNodeDriver.driver_key)
self.logger = logging.getLogger("%s.%s" %
(config.conf.logging.nodedriver_logger_name, self.driver_key))

4
drydock_provisioner/drivers/oob/manual_driver/driver.py
View File

@ -14,7 +14,7 @@
import time
import logging
import drydock_provisioner
import drydock_provisioner.config as config
import drydock_provisioner.error as errors
@ -37,7 +37,7 @@ class ManualDriver(oob.OobDriver):
self.driver_desc = "Manual (Noop) OOB Driver"
self.logger = logging.getLogger("%s.%s" %
(drydock_provisioner.conf.logging.oobdriver_logger_name, self.driver_key))
(config.conf.logging.oobdriver_logger_name, self.driver_key))
def execute_task(self, task_id):
task = self.state_manager.get_task(task_id)

6
drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py
View File

@ -16,7 +16,7 @@ import logging
from pyghmi.ipmi.command import Command
import drydock_provisioner
import drydock_provisioner.config as config
import drydock_provisioner.error as errors
import drydock_provisioner.objects.fields as hd_fields
@ -38,7 +38,7 @@ class PyghmiDriver(oob.OobDriver):
self.driver_desc = "Pyghmi OOB Driver"
self.logger = logging.getLogger("%s.%s" %
(drydock_provisioner.conf.logging.oobdriver_logger_name, self.driver_key))
(config.conf.logging.oobdriver_logger_name, self.driver_key))
def execute_task(self, task_id):
task = self.state_manager.get_task(task_id)
@ -101,7 +101,7 @@ class PyghmiDriver(oob.OobDriver):
attempts = 0
while (len(incomplete_subtasks) > 0 and
attempts <= getattr(drydock_provisioner.conf.timeouts, task.action, drydock_provisioner.conf.timeouts.drydock_timeout)):
attempts <= getattr(config.conf.timeouts, task.action, config.conf.timeouts.drydock_timeout)):
for n in incomplete_subtasks:
t = self.state_manager.get_task(n)
if t.get_status() in [hd_fields.TaskStatus.Terminated,