From 06eb5e705742a62a420453edce4f008bfda511f9 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Mon, 26 Jun 2017 13:31:59 -0500 Subject: [PATCH] Move environment override to after option init --- drydock_provisioner/drydock.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drydock_provisioner/drydock.py b/drydock_provisioner/drydock.py index b49d34ea..d648a498 100644 --- a/drydock_provisioner/drydock.py +++ b/drydock_provisioner/drydock.py @@ -12,8 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging -from oslo_config import cfg import sys +import os + +from oslo_config import cfg import drydock_provisioner.config as config import drydock_provisioner.objects as objects @@ -37,11 +39,6 @@ def start_drydock(): if config.conf.debug: config.conf.set_override(name='log_level', override='DEBUG', group='logging') - # Check if we have an API key in the environment - # Hack around until we move MaaS configs to the YAML schema - if 'MAAS_API_KEY' in os.environ: - config.conf.set_override(name='maas_api_key', override=os.environ['MAAS_API_KEY'], group='maasdriver') - # Setup root logger logger = logging.getLogger(config.conf.logging.global_logger_name) @@ -68,6 +65,11 @@ def start_drydock(): input_ingester = ingester.Ingester() input_ingester.enable_plugins(config.conf.plugins.ingester) + # Check if we have an API key in the environment + # Hack around until we move MaaS configs to the YAML schema + if 'MAAS_API_KEY' in os.environ: + config.conf.set_override(name='maas_api_key', override=os.environ['MAAS_API_KEY'], group='maasdriver') + # Now that loggers are configured, log the effective config config.conf.log_opt_values(logging.getLogger(config.conf.logging.global_logger_name), logging.DEBUG)