removing compute monitor

setup.py

@@ -124,7 +124,6 @@ setup(name='nova',
                'bin/nova-dhcpbridge',
                'bin/nova-direct-api',
                'bin/nova-import-canonical-imagestore',
-               'bin/nova-instancemonitor',
                'bin/nova-logspool',
                'bin/nova-manage',
                'bin/nova-network',

tools/eventlet-patch

@@ -1,24 +0,0 @@
-# HG changeset patch
-# User Soren Hansen <soren@linux2go.dk>
-# Date 1297678255 -3600
-# Node ID 4c846d555010bb5a91ab4da78dfe596451313742
-# Parent  5b7e9946c79f005c028eb63207cf5eb7bb21d1c3
-Don't attempt to wrap GreenPipes in GreenPipe
-
-If the os module is monkeypatched, Python's standard subprocess module
-will return greenio.GreenPipe instances for Popen objects' stdin, stdout,
-and stderr attributes. However, eventlet.green.subprocess tries to wrap
-these attributes in another greenio.GreenPipe, which GreenPipe refuses.
-
-diff -r 5b7e9946c79f -r 4c846d555010 eventlet/green/subprocess.py
---- a/eventlet/green/subprocess.py	Sat Feb 05 13:05:05 2011 -0800
-+++ b/eventlet/green/subprocess.py	Mon Feb 14 11:10:55 2011 +0100
-@@ -27,7 +27,7 @@
-             # eventlet.processes.Process.run() method.
-             for attr in "stdin", "stdout", "stderr":
-                 pipe = getattr(self, attr)
--                if pipe is not None:
-+                if pipe is not None and not type(pipe) == greenio.GreenPipe:
-                     wrapped_pipe = greenio.GreenPipe(pipe, pipe.mode, bufsize)
-                     setattr(self, attr, wrapped_pipe)
-         __init__.__doc__ = subprocess_orig.Popen.__init__.__doc__

tools/install_venv.py

@@ -31,7 +31,6 @@ import sys
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 VENV = os.path.join(ROOT, '.nova-venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
-TWISTED_NOVA = 'http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz'
 PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
 
@@ -106,20 +105,12 @@ def install_dependencies(venv=VENV):
               'greenlet'], redirect_output=False)
     run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, '-r',
               PIP_REQUIRES], redirect_output=False)
-    run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv,
-              TWISTED_NOVA], redirect_output=False)
 
     # Tell the virtual env how to "import nova"
     pthfile = os.path.join(venv, "lib", PY_VERSION, "site-packages",
                         "nova.pth")
     f = open(pthfile, 'w')
     f.write("%s\n" % ROOT)
-    # Patch eventlet (see FAQ # 1485)
-    patchsrc = os.path.join(ROOT, 'tools', 'eventlet-patch')
-    patchfile = os.path.join(venv, "lib", PY_VERSION, "site-packages",
-                          "eventlet", "green", "subprocess.py")
-    patch_cmd = "patch %s %s" % (patchfile, patchsrc)
-    os.system(patch_cmd)
 
 
 def print_help():

tools/pip-requires

@@ -20,13 +20,13 @@ mox==0.5.3
 greenlet==0.3.1
 nose
 bzr
-Twisted>=10.1.0
 PasteDeploy
 paste
 sqlalchemy-migrate
 netaddr
 sphinx
 glance
+xattr>=0.6.0
 nova-adminclient
 suds==0.4
 coverage