setup.py: move paramiko back to "install_requires"

move following python modules back to "install_requires"

* apache-libcloud
* netaddr
* paramiko

they are imported even when teuthology is used by vstart_runner.py

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/setup.py b/setup.py
index a28c37a9c8fc24e74c3294438c2ea9e5a13ab3dd..86753f8a8093f9d3ce44dd43d5963948391dda51 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -48,13 +48,18 @@ setup(
         'Topic :: System :: Distributed Computing',
         'Topic :: System :: Filesystems',
     ],
-    install_requires=['gevent',
+    install_requires=['apache-libcloud',
+                      'gevent',
                       'PyYAML',
                       'argparse >= 1.2.1',
                       'configobj',
                       'six >= 1.9', # python-openstackclient won't work properly with less
                       'pexpect',
                       'docopt',
+                      'netaddr',  # teuthology/misc.py
+                      # only used by orchestra, but we monkey-patch it in
+                      # teuthology/__init__.py
+                      'paramiko',
                       'psutil >= 2.1.0',
                       'configparser',
                       'ansible>=2.0',
@@ -64,13 +69,11 @@ setup(
     extras_require = {
         'coverage': [ 'mysqlclient == 1.4.2'],
         'orchestra': [
-            'apache-libcloud',
             # For apache-libcloud when using python < 2.7.9
             'backports.ssl_match_hostname',
             'beanstalkc3 >= 0.4.0',
             'httplib2',
             'ndg-httpsclient',  # for requests, urllib3
-            'paramiko',
             'pyasn1',           # for requests, urllib3
             'pyopenssl>=0.13',  # for requests, urllib3
             'python-dateutil',