diff --git a/extras/install-tips.sh b/extras/install-tips.sh index b450e9124..66b7a0af1 100644 --- a/extras/install-tips.sh +++ b/extras/install-tips.sh @@ -21,7 +21,6 @@ for lib in \ python-keystoneclient \ python-cinderclient \ python-neutronclient \ - python-troveclient \ python-ironicclient \ python-heatclient \ python-designateclient \ diff --git a/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml b/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml new file mode 100644 index 000000000..1096921a5 --- /dev/null +++ b/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - troveclient is no longer a hard dependency. Users + who were using shade to construct a troveclient + Client object should use os_client_config.make_legacy_client + instead. diff --git a/requirements.txt b/requirements.txt index c0187fe74..80e8951eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,6 @@ python-novaclient>=2.21.0,!=2.27.0,!=2.32.0 python-keystoneclient>=0.11.0 python-cinderclient>=1.3.1 python-neutronclient>=2.3.10 -python-troveclient>=1.2.0 python-ironicclient>=0.10.0 python-heatclient>=1.0.0 python-designateclient>=2.1.0 diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index 6bac67d5f..5c027c2e5 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -42,7 +42,6 @@ import magnumclient.client import neutronclient.neutron.client import novaclient.client import novaclient.exceptions as nova_exceptions -import troveclient.client import designateclient.client from shade.exc import * # noqa @@ -1187,6 +1186,11 @@ class OpenStackCloud(_normalize.Normalizer): @property def trove_client(self): + warnings.warn( + 'Using shade to get a trove_client object is deprecated. If you' + ' need a raw troveclient.client.Client object, please use' + ' make_legacy_client in os-client-config instead') + import troveclient.client if self._trove_client is None: self._trove_client = self._get_client( 'database', troveclient.client.Client)