pull-up from trunk

3 files changed, 7 insertions, 1 deletions

diff --git a/.mailmap b/.mailmap
index 6673d0a26..ff304c891 100644
--- a/.mailmap
+++ b/.mailmap
@@ -50,4 +50,5 @@
 <ilyaalekseyev@acm.org> <ialekseev@griddynamics.com>
 <ilyaalekseyev@acm.org> <ilya@oscloud.ru>
 <reldan@oscloud.ru> <enugaev@griddynamics.com>
-<kshileev@gmail.com> <kshileev@griddynamics.com>
\ No newline at end of file
+<kshileev@gmail.com> <kshileev@griddynamics.com>
+<nsokolov@griddynamics.com> <nsokolov@griddynamics.net>
diff --git a/Authors b/Authors
index c3a65f1b4..1b3c90764 100644
--- a/Authors
+++ b/Authors
@@ -68,6 +68,7 @@ MORITA Kazutaka <morita.kazutaka@gmail.com>
 Muneyuki Noguchi <noguchimn@nttdata.co.jp>
 Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
 Naveed Massjouni <naveedm9@gmail.com>
+Nikolay Sokolov <nsokolov@griddynamics.com>
 Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
 Paul Voccio <paul@openstack.org>
 Renuka Apte <renuka.apte@citrix.com>
diff --git a/bin/nova-api b/bin/nova-api
index fff67251f..4c5164ea1 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -24,8 +24,10 @@ Starts both the EC2 and OpenStack APIs in separate processes.
 """
 
 import os
+import signal
 import sys
 
+
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
         sys.argv[0]), os.pardir, os.pardir))
 if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
@@ -46,6 +48,8 @@ def main():
     launcher.launch_service(ec2)
     launcher.launch_service(osapi)
 
+    signal.signal(signal.SIGTERM, lambda *_: launcher.stop())
+
     try:
         launcher.wait()
     except KeyboardInterrupt: