Register DEFAULT group on agent start

From upstream commit 4d3a2747 fixing bug (#1968606), registration of the group DEFAULT does not happen automatically anymore. If not loaded, agent fails with 'oslo_config.cfg.NoSuchOptError: no such option base_mac in group [DEFAULT]
sapcc · Oct 11, 2024 · e259674 · e259674
1 parent 8cf1369
commit e259674
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 45 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [3.8.14]
-        tox-env: [unit,pep8,pip-missing-reqs]
+        tox-env: [pep8,]
     env:
       TOXENV: ${{ matrix.tox-env }}
     steps:

diff --git a/networking_nsxv3/plugins/ml2/drivers/nsxv3/agent/agent.py b/networking_nsxv3/plugins/ml2/drivers/nsxv3/agent/agent.py
@@ -306,6 +306,7 @@ def delete_unreferenced_arp_protection(self, current_devices):
 
 
 def main():
+    common_config.register_common_config_options()
     common_config.init(sys.argv[1:])
     common_config.setup_logging()
     agent_config.register_agent_state_opts_helper(cfg.CONF)

diff --git a/networking_nsxv3/plugins/ml2/drivers/nsxv3/agent/cli.py b/networking_nsxv3/plugins/ml2/drivers/nsxv3/agent/cli.py
@@ -305,6 +305,7 @@ def _init_(self, args):
         for file in args.config_file:
             neutron_config.extend(["--config-file", file])
 
+        common_config.register_common_config_options()
         common_config.init(neutron_config)
         common_config.setup_logging()
         profiler.setup(nsxv3_constants.NSXV3_BIN, cfg.CONF.host)