requirements: Move openstack to its own variant

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/requirements.txt b/requirements.txt
index af2378b4d82a1d027a92a130fafc2263130c323f..ab831c030947a9f9ceb9d5350f3efd3c2b7d546a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,12 +10,8 @@ ansible-base==2.10.17
     # via ansible
 apache-libcloud==3.3.1
     # via teuthology (pyproject.toml)
-appdirs==1.4.4
-    # via openstacksdk
 attrs==21.2.0
-    # via
-    #   cmd2
-    #   pytest
+    # via pytest
 backports-ssl-match-hostname==3.7.0.1
     # via teuthology (pyproject.toml)
 bcrypt==3.2.0
@@ -45,14 +41,6 @@ charset-normalizer==2.0.4
     # via requests
 click==8.0.1
     # via pip-tools
-cliff==3.8.0
-    # via
-    #   osc-lib
-    #   python-openstackclient
-cmd2==2.1.2
-    # via cliff
-colorama==0.4.4
-    # via cmd2
 configobj==5.0.6
     # via teuthology (pyproject.toml)
 configparser==5.0.2
@@ -60,25 +48,12 @@ configparser==5.0.2
 cryptography==41.0.7
     # via
     #   ansible-base
-    #   openstacksdk
     #   paramiko
     #   pyopenssl
-    #   teuthology (pyproject.toml)
-debtcollector==2.2.0
-    # via
-    #   oslo-config
-    #   oslo-utils
-    #   python-keystoneclient
-decorator==5.0.9
-    # via
-    #   dogpile-cache
-    #   openstacksdk
 distlib==0.3.4
     # via virtualenv
 docopt==0.6.2
     # via teuthology (pyproject.toml)
-dogpile-cache==1.1.5
-    # via openstacksdk
 filelock==3.4.1
     # via
     #   tox
@@ -97,31 +72,12 @@ iniconfig==1.1.1
     # via pytest
 ipy==1.1
     # via teuthology (pyproject.toml)
-iso8601==0.1.16
-    # via
-    #   keystoneauth1
-    #   openstacksdk
-    #   oslo-utils
-    #   python-novaclient
-    #   python-openstackclient
 jinja2==3.0.1
     # via ansible-base
 jmespath==0.10.0
     # via
     #   boto3
     #   botocore
-    #   openstacksdk
-jsonpatch==1.32
-    # via openstacksdk
-jsonpointer==2.1
-    # via jsonpatch
-keystoneauth1==4.3.1
-    # via
-    #   openstacksdk
-    #   osc-lib
-    #   python-cinderclient
-    #   python-keystoneclient
-    #   python-novaclient
 lupa==1.14.1
     # via teuthology (pyproject.toml)
 lxml==4.9.3
@@ -130,81 +86,20 @@ markupsafe==2.0.1
     # via jinja2
 mock==4.0.3
     # via teuthology (pyproject.toml)
-msgpack==1.0.2
-    # via oslo-serialization
-munch==2.5.0
-    # via openstacksdk
 ndg-httpsclient==0.5.1
     # via teuthology (pyproject.toml)
 netaddr==0.8.0
-    # via
-    #   oslo-config
-    #   oslo-utils
-    #   teuthology (pyproject.toml)
-netifaces==0.11.0
-    # via
-    #   openstacksdk
-    #   oslo-utils
+    # via teuthology (pyproject.toml)
 nose==1.3.7
     # via teuthology (pyproject.toml)
-openstacksdk==0.58.0
-    # via
-    #   osc-lib
-    #   python-openstackclient
-os-service-types==1.7.0
-    # via
-    #   keystoneauth1
-    #   openstacksdk
-osc-lib==2.4.1
-    # via python-openstackclient
-oslo-config==8.8.0
-    # via python-keystoneclient
-oslo-i18n==5.1.0
-    # via
-    #   osc-lib
-    #   oslo-config
-    #   oslo-utils
-    #   python-cinderclient
-    #   python-keystoneclient
-    #   python-novaclient
-    #   python-openstackclient
-oslo-serialization==4.3.0
-    # via
-    #   python-keystoneclient
-    #   python-novaclient
-oslo-utils==4.12.2
-    # via
-    #   osc-lib
-    #   oslo-serialization
-    #   python-cinderclient
-    #   python-keystoneclient
-    #   python-novaclient
-    #   python-openstackclient
 packaging==22.0
     # via
     #   ansible-base
     #   build
-    #   oslo-utils
     #   pytest
     #   tox
 paramiko==2.12.0
     # via teuthology (pyproject.toml)
-pbr==5.6.0
-    # via
-    #   cliff
-    #   debtcollector
-    #   keystoneauth1
-    #   openstacksdk
-    #   os-service-types
-    #   osc-lib
-    #   oslo-i18n
-    #   oslo-serialization
-    #   oslo-utils
-    #   python-cinderclient
-    #   python-keystoneclient
-    #   python-novaclient
-    #   python-openstackclient
-    #   stevedore
 pep517==0.11.0
     # via build
 pexpect==4.8.0
@@ -218,11 +113,7 @@ pluggy==1.0.0
     #   pytest
     #   tox
 prettytable==2.1.0
-    # via
-    #   cliff
-    #   python-cinderclient
-    #   python-novaclient
-    #   teuthology (pyproject.toml)
+    # via teuthology (pyproject.toml)
 prometheus-client==0.16.0
     # via teuthology (pyproject.toml)
 psutil==5.8.0
@@ -250,83 +141,34 @@ pyopenssl==20.0.1
     #   ndg-httpsclient
     #   teuthology (pyproject.toml)
 pyparsing==2.4.7
-    # via
-    #   cliff
-    #   httplib2
-    #   oslo-utils
-pyperclip==1.8.2
-    # via cmd2
+    # via httplib2
 pytest==7.0.1
     # via teuthology (pyproject.toml)
-python-cinderclient==8.0.0
-    # via python-openstackclient
 python-dateutil==2.8.2
     # via
     #   botocore
     #   teuthology (pyproject.toml)
-python-keystoneclient==4.2.0
-    # via python-openstackclient
-python-novaclient==17.5.0
-    # via
-    #   python-openstackclient
-    #   teuthology (pyproject.toml)
-python-openstackclient==5.5.0
-    # via teuthology (pyproject.toml)
-pytz==2021.1
-    # via
-    #   oslo-serialization
-    #   oslo-utils
 pyyaml==5.3.1
     # via
     #   ansible-base
-    #   cliff
-    #   openstacksdk
-    #   oslo-config
     #   teuthology (pyproject.toml)
 requests==2.27.1
     # via
     #   apache-libcloud
-    #   keystoneauth1
-    #   oslo-config
-    #   python-cinderclient
-    #   python-keystoneclient
     #   teuthology (pyproject.toml)
-requestsexceptions==1.4.0
-    # via openstacksdk
-rfc3986==1.5.0
-    # via oslo-config
 s3transfer==0.5.2
     # via boto3
 sentry-sdk==1.6.0
     # via teuthology (pyproject.toml)
-simplejson==3.17.3
-    # via
-    #   osc-lib
-    #   python-cinderclient
 six==1.16.0
     # via
     #   bcrypt
     #   configobj
-    #   debtcollector
-    #   keystoneauth1
-    #   munch
     #   paramiko
     #   pyopenssl
     #   python-dateutil
-    #   python-keystoneclient
     #   tox
     #   virtualenv
-stevedore==3.3.0
-    # via
-    #   cliff
-    #   dogpile-cache
-    #   keystoneauth1
-    #   osc-lib
-    #   oslo-config
-    #   python-cinderclient
-    #   python-keystoneclient
-    #   python-novaclient
-    #   python-openstackclient
 toml==0.10.2
     # via
     #   teuthology (pyproject.toml)
@@ -345,13 +187,9 @@ urllib3==1.26.18
 virtualenv==20.14.1
     # via tox
 wcwidth==0.2.5
-    # via
-    #   cmd2
-    #   prettytable
+    # via prettytable
 wheel==0.38.1
     # via pip-tools
-wrapt==1.12.1
-    # via debtcollector
 xmltodict==0.12.0
     # via teuthology (pyproject.toml)
 zope-event==4.5.0

diff --git a/setup.cfg b/setup.cfg
index 183a4db45abe8061cb4f2ab2bf0ba5bfac3997b4..6e47df5f886c67243347bc3bbd9224b1f4c4e30b 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -53,8 +53,6 @@ install_requires =
     pynacl>=1.5.0
     pyopenssl>=0.13
     python-dateutil
-    python-novaclient
-    python-openstackclient
     requests>2.13.0
     sentry-sdk
     prometheus_client>=0.16.0
@@ -105,6 +103,9 @@ test =
     toml
     tox
     xmltodict
+openstack =
+    python-openstackclient
+    python-novaclient
 
 [options.package_data]
 teuthology.openstack =