summaryrefslogtreecommitdiff
path: root/ironic
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-02-07 19:45:52 +0000
committerGerrit Code Review <review@openstack.org>2022-02-07 19:45:52 +0000
commit45325c21ec25f9f4f26cb602e3cd59c3ee5c49dd (patch)
treeb5e3a69ed64ee48d4f5f9a2ae3a7ffcf5ebf79b5 /ironic
parente38ac57b3eb6049ccb328ebe20c4f53835a7ef8d (diff)
parente841fa05456ae8cfa35222fc6b787d9aadababe6 (diff)
downloadironic-45325c21ec25f9f4f26cb602e3cd59c3ee5c49dd.tar.gz
Merge "Return non-zero exit code on failures"
Diffstat (limited to 'ironic')
-rw-r--r--ironic/cmd/api.py2
-rw-r--r--ironic/cmd/conductor.py2
-rw-r--r--ironic/cmd/singleprocess.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py
index 2323c4b09..f75aa9ee7 100644
--- a/ironic/cmd/api.py
+++ b/ironic/cmd/api.py
@@ -39,7 +39,7 @@ def main():
launcher = ironic_service.process_launcher()
server = wsgi_service.WSGIService('ironic_api', CONF.api.enable_ssl_api)
launcher.launch_service(server, workers=server.workers)
- launcher.wait()
+ sys.exit(launcher.wait())
if __name__ == '__main__':
diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py
index 843185890..5fa4c8489 100644
--- a/ironic/cmd/conductor.py
+++ b/ironic/cmd/conductor.py
@@ -67,7 +67,7 @@ def main():
issue_startup_warnings(CONF)
launcher = service.launch(CONF, mgr, restart_method='mutate')
- launcher.wait()
+ sys.exit(launcher.wait())
if __name__ == '__main__':
diff --git a/ironic/cmd/singleprocess.py b/ironic/cmd/singleprocess.py
index ea2e01365..20a348ae5 100644
--- a/ironic/cmd/singleprocess.py
+++ b/ironic/cmd/singleprocess.py
@@ -49,4 +49,4 @@ def main():
wsgi = wsgi_service.WSGIService('ironic_api', CONF.api.enable_ssl_api)
launcher.launch_service(wsgi)
- launcher.wait()
+ sys.exit(launcher.wait())