From d703a634a4d71b54957a3a554797dc5b78aad566 Mon Sep 17 00:00:00 2001 From: Adrian Turjak Date: Fri, 26 Feb 2021 13:37:48 +1300 Subject: [PATCH] Fix a bug with feature set config not being added as expected The feature set config group was entirely missed from the config tree, and the group itself wasn't setup for lazy_loading despite needing to be based on when it is meant to have config added to it. Change-Id: Ia9569ebb76ffe91d592dbc94bc528bde4aa00fc4 --- adjutant/config/__init__.py | 2 ++ adjutant/config/feature_sets.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adjutant/config/__init__.py b/adjutant/config/__init__.py index 02cd614..c85528a 100644 --- a/adjutant/config/__init__.py +++ b/adjutant/config/__init__.py @@ -24,6 +24,7 @@ from adjutant.config import identity from adjutant.config import notification from adjutant.config import quota from adjutant.config import workflow +from adjutant.config import feature_sets _root_config = groups.ConfigGroup("adjutant") _root_config.register_child_config(django.config_group) @@ -32,6 +33,7 @@ _root_config.register_child_config(api.config_group) _root_config.register_child_config(notification.config_group) _root_config.register_child_config(workflow.config_group) _root_config.register_child_config(quota.config_group) +_root_config.register_child_config(feature_sets.config_group) _config_files = [ "/etc/adjutant/adjutant.yaml", diff --git a/adjutant/config/feature_sets.py b/adjutant/config/feature_sets.py index b1835fe..43af0c3 100644 --- a/adjutant/config/feature_sets.py +++ b/adjutant/config/feature_sets.py @@ -15,4 +15,4 @@ from confspirator import groups -config_group = groups.ConfigGroup("feature_sets") +config_group = groups.ConfigGroup("feature_sets", lazy_load=True)