airship/drydock
Code Issues Proposed changes

Move environment override to after option init

Browse Source
This commit is contained in:
Scott Hussey 2017-06-26 13:31:59 -05:00
parent 7e6b2f6442
commit 06eb5e7057
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drydock_provisioner/drydock.py
View File

@ -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)