diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-03-24 18:07:51 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-03-24 18:07:51 +0100 |
| commit | c5ef4b9203d396d02dde92760acd95a0912caa68 (patch) | |
| tree | 19fcecd73de003318b4a40ab00335797489348c6 /ironic/cmd | |
| parent | 30b0c56d231ae0c6628b2830fe9a1c304a78f2be (diff) | |
| download | ironic-c5ef4b9203d396d02dde92760acd95a0912caa68.tar.gz | |
Start API after conductor is started in the combined executable
Change-Id: Icaffb5d346001d62e5c9522708dd44f01faeb3a6
Diffstat (limited to 'ironic/cmd')
| -rw-r--r-- | ironic/cmd/singleprocess.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/cmd/singleprocess.py b/ironic/cmd/singleprocess.py index 675bd1bc2..28100efe9 100644 --- a/ironic/cmd/singleprocess.py +++ b/ironic/cmd/singleprocess.py @@ -46,12 +46,12 @@ def main(): conductor_cmd.issue_startup_warnings(CONF) launcher.launch_service(mgr) - wsgi = wsgi_service.WSGIService('ironic_api', CONF.api.enable_ssl_api) - launcher.launch_service(wsgi) - # 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() + wsgi = wsgi_service.WSGIService('ironic_api', CONF.api.enable_ssl_api) + launcher.launch_service(wsgi) + sys.exit(launcher.wait()) |