From: Steve Baker <sbaker@redhat.com>
Date: Tue, 2 Apr 2013 02:09:29 +0000 (+1300)
Subject: No longer pass no_cache=True to novaclient create
X-Git-Tag: 2014.1~730^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f3fc5c5;p=openstack-build%2Fheat-build.git

No longer pass no_cache=True to novaclient create

The default is now os_cache=False, so default behaviour will not
use a keyring that prompts for a password.

This was committed on 2012-12-12 and released in
python-novaclient 2.11.0 on 2013-02-11

Part of blueprint auth-token-only

Change-Id: Id2846b2e344f8e3321240795aebf9a59ddad711a
---

diff --git a/heat/engine/clients.py b/heat/engine/clients.py
index b5781f81..ae8a8e77 100644
--- a/heat/engine/clients.py
+++ b/heat/engine/clients.py
@@ -95,18 +95,7 @@ class OpenStackClients(object):
             logger.error("Nova connection failed, no password or auth_token!")
             return None
 
-        client = None
-        try:
-            # Workaround for issues with python-keyring, need no_cache=True
-            # ref https://bugs.launchpad.net/python-novaclient/+bug/1020238
-            # TODO(shardy): May be able to remove when the bug above is fixed
-            client = novaclient.Client(1.1, no_cache=True, **args)
-            self._nova[service_type] = client
-        except TypeError:
-            # for compatibility with essex, which doesn't have no_cache=True
-            # TODO(shardy): remove when we no longer support essex
-            client = novaclient.Client(1.1, **args)
-            self._nova[service_type] = client
+        client = novaclient.Client(1.1, **args)
 
         if con.password is None and con.auth_token is not None:
             management_url = self.url_for(service_type=service_type)
diff --git a/tools/pip-requires b/tools/pip-requires
index 08de99e6..06795f9b 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -19,7 +19,7 @@ kombu>=1.0.4
 argparse
 lxml>=2.3,<=2.3.5
 sqlalchemy-migrate>=0.7.2
-python-novaclient
+python-novaclient>=2.11.0,<3
 PasteDeploy==1.5.0
 routes==1.12.3
 SQLAlchemy>=0.7.8,<0.7.99