From 2a6b9560f5048dec3e3814fc165c6d9d997649d6 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Wed, 21 Jun 2017 12:57:33 -0500 Subject: [PATCH] Update some references to old configuration object --- drydock_provisioner/control/middleware.py | 6 +++--- drydock_provisioner/drivers/node/maasdriver/driver.py | 2 +- drydock_provisioner/drivers/oob/manual_driver/driver.py | 4 ++-- drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drydock_provisioner/control/middleware.py b/drydock_provisioner/control/middleware.py index b28c6845..7ab7e690 100644 --- a/drydock_provisioner/control/middleware.py +++ b/drydock_provisioner/control/middleware.py @@ -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 diff --git a/drydock_provisioner/drivers/node/maasdriver/driver.py b/drydock_provisioner/drivers/node/maasdriver/driver.py index 597b2e74..23ae2e85 100644 --- a/drydock_provisioner/drivers/node/maasdriver/driver.py +++ b/drydock_provisioner/drivers/node/maasdriver/driver.py @@ -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)) diff --git a/drydock_provisioner/drivers/oob/manual_driver/driver.py b/drydock_provisioner/drivers/oob/manual_driver/driver.py index 6e483aef..ab64d3a8 100644 --- a/drydock_provisioner/drivers/oob/manual_driver/driver.py +++ b/drydock_provisioner/drivers/oob/manual_driver/driver.py @@ -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) diff --git a/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py b/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py index efdfa1c8..25f03b75 100644 --- a/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py +++ b/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py @@ -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,