Merge orchestra into teuthology.

There are too many things called Orchestra out there,
including Ubuntu's new multi-machine service orchestration
framework. The code might still be beneficial outside of
teuthology, but it can be spun off at that time.

Conflicts:
	bootstrap
	requirements.txt
	setup.py

diff --cc requirements.txt
index 0b442b2cff35989c63e89038089749c3a190a7fa,cbd3da8803231c1d1ffc3d6f6a386aba319496e4..99c1b9003127cc38c5b4370d9c621ab7e6368a4e
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -1,7 -1,6 +1,12 @@@
- -e git+git://ceph.newdream.net/orchestra.git#egg=orchestra
+ # 0.14 switches to libev, that means bootstrap needs to change too
+ gevent ==0.13.6
+ # 1.7.7 has AES-128-CBC support for SSH keys, that's needed
+ paramiko >=1.7.7
 +configobj
 +PyYAML
 +bunch >=1.0.0
 +argparse >=1.2.1
 +httplib2
 +beanstalkc >=0.2.0
+ nose >=1.0.0
+ fudge >=1.0.3

diff --cc setup.py
index aa975b2498e2226bf86098e7ac5cbf6f63cc25f0,695cd36a14381bd76c0aad63e751b6a55ea31d9d..9f88258a0fabfb80d78cb05be705c4da3f2228d5
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -8,33 -8,15 +8,36 @@@ setup
  
      author='Tommi Virtanen',
      author_email='tommi.virtanen@dreamhost.com',
 -    description='Orchestration of multiple machines over SSH',
 +    description='Ceph test runner',
      license='MIT',
 -    keywords='ssh cluster',
 +    keywords='ceph testing ssh cluster',
  
      install_requires=[
-         'orchestra',
+         'gevent ==0.13.6',
+         'paramiko >=1.7.7',
 +        'configobj',
 +        'PyYAML',
 +        'bunch >=1.0.0',
 +        'argparse >=1.2.1',
 +        'httplib2',
 +        'beanstalkc >=0.2.0',
+         'nose >=1.0.0',
+         'fudge >=1.0.3',
          ],
  
 +    entry_points={
 +        'console_scripts': [
 +            'teuthology = teuthology.run:main',
 +            'teuthology-nuke = teuthology.nuke:main',
 +            'teuthology-suite = teuthology.suite:main',
 +            'teuthology-ls = teuthology.suite:ls',
 +            'teuthology-worker = teuthology.queue:worker',
 +            'teuthology-lock = teuthology.lock:main',
 +            'teuthology-schedule = teuthology.run:schedule',
 +            'teuthology-updatekeys = teuthology.lock:update_hostkeys',
 +            'teuthology-coverage = teuthology.coverage:analyze',
 +            'teuthology-results = teuthology.suite:results',
 +            ],
 +        },
 +
      )