From c06bbe99734f2fea35cfb4bdd854814c9119b617 Mon Sep 17 00:00:00 2001
From: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date: Fri, 19 Aug 2011 12:30:55 -0700
Subject: Added monkey patching notification code function w

---
 bin/nova-api         | 2 +-
 bin/nova-compute     | 1 +
 bin/nova-network     | 1 +
 bin/nova-objectstore | 1 +
 bin/nova-scheduler   | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index fe8e83366..4edf77c7f 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -45,7 +45,7 @@ FLAGS = flags.FLAGS
 def main():
     """Launch EC2 and OSAPI services."""
     nova.utils.Bootstrapper.bootstrap_binary(sys.argv)
-
+    nova.utils.monkey_patch()
     launcher = nova.service.Launcher()
 
     for api in FLAGS.enabled_apis:
diff --git a/bin/nova-compute b/bin/nova-compute
index cd7c78def..1de53c075 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -45,5 +45,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
+    utils.monkey_patch()
     service.serve()
     service.wait()
diff --git a/bin/nova-network b/bin/nova-network
index 101761ef7..5b66b8f2b 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -45,5 +45,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
+    utils.monkey_patch()
     service.serve()
     service.wait()
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 4d5aec445..c2860f534 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -49,6 +49,7 @@ if __name__ == '__main__':
     utils.default_flagfile()
     FLAGS(sys.argv)
     logging.setup()
+    utils.monkey_patch()
     router = s3server.S3Application(FLAGS.buckets_path)
     server = wsgi.Server("S3 Objectstore",
                          router,
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 0c205a80f..ae3db51bc 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -45,5 +45,6 @@ if __name__ == '__main__':
     utils.default_flagfile()
     flags.FLAGS(sys.argv)
     logging.setup()
+    utils.monkey_patch()
     service.serve()
     service.wait()
-- 
cgit 


From 46ba1b111bfff27edcb963bc43869f26b02d569a Mon Sep 17 00:00:00 2001
From: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date: Fri, 19 Aug 2011 13:31:54 -0700
Subject: Fixed mistake on mergew

---
 bin/nova-scheduler | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index ae3db51bc..c1033a304 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -46,5 +46,6 @@ if __name__ == '__main__':
     flags.FLAGS(sys.argv)
     logging.setup()
     utils.monkey_patch()
-    service.serve()
+    server = service.Service.create(binary='nova-scheduler')
+    service.serve(server)
     service.wait()
-- 
cgit