From 691fd01b61ebe303d4c784951f5fe4dc86850a26 Mon Sep 17 00:00:00 2001
From: Samuel Roberts <sam.roberts@geant.org>
Date: Tue, 24 Oct 2023 15:33:17 +0100
Subject: [PATCH] on second thoughts it can go into the final task
---
inventory_provider/tasks/worker.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index b12548c5..beaa8b8a 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -460,8 +460,7 @@ def update_entry_point(self):
(reload_lab_router_config_chorded.s(r)
for r in lab_routers),
empty_task.si('lab router tasks complete')
- )),
- collate_netconf_interfaces_all_cache.si().on_error(task_error_handler.s())
+ ))
),
),
final_task.si().on_error(task_error_handler.s())
@@ -1399,6 +1398,7 @@ def final_task(self):
_build_snmp_peering_db(update_callback=self.log_info)
_build_juniper_peering_db(update_callback=self.log_info)
populate_poller_interfaces_cache(warning_callback=self.log_warning)
+ collate_netconf_interfaces_all_cache(warning_callback=self.log_warning)
latch_db(InventoryTask.config)
self.log_info('latched current/next dbs')
@@ -1450,7 +1450,6 @@ def populate_poller_interfaces_cache(warning_callback=lambda s: None):
r.set(all_cache_key, json.dumps(all_populated_interfaces))
-@app.task(base=InventoryTask, bind=True, name='collate_netconf_interfaces_all_cache')
@log_task_entry_and_exit
def collate_netconf_interfaces_all_cache(warning_callback=lambda s: None):
"""
--
GitLab