summaryrefslogtreecommitdiff
path: root/ironic/cmd/conductor.py
diff options
context:
space:
mode:
Diffstat (limited to 'ironic/cmd/conductor.py')
-rw-r--r--ironic/cmd/conductor.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py
index 5fa4c8489..a932cb22f 100644
--- a/ironic/cmd/conductor.py
+++ b/ironic/cmd/conductor.py
@@ -67,6 +67,12 @@ def main():
issue_startup_warnings(CONF)
launcher = service.launch(CONF, mgr, restart_method='mutate')
+
+ # NOTE(dtantsur): handling start-up failures before launcher.wait() helps
+ # notify systemd about them. Otherwise the launcher will report successful
+ # service start-up before checking the threads.
+ mgr.wait_for_start()
+
sys.exit(launcher.wait())