From 48f93c8a7418f7e0deffef723f449cc6921088e4 Mon Sep 17 00:00:00 2001
From: Jamie McCarthy <jamie@mccarthy.vg>
Date: Thu, 22 Jan 2015 11:17:23 -0500
Subject: [PATCH] Permit newer versions of nova client

python_novaclient prior to 2.14.2 has pbr requirements that conflict
with other modules' requirements, making installation impossible.
Newer versions are fine.

shell.py whitespace changes are to pass pep8. Dummy test is to pass
python27.

Change-Id: I506e9c9d23e155be29481153522b24c1b8235fe8
---
 libraclient/shell.py       | 4 ++--
 requirements.txt           | 2 +-
 tests/test_lbaas_client.py | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_lbaas_client.py

diff --git a/libraclient/shell.py b/libraclient/shell.py
index 8763731..d0468d2 100644
--- a/libraclient/shell.py
+++ b/libraclient/shell.py
@@ -214,7 +214,7 @@ class LibraClientArgumentParser(argparse.ArgumentParser):
         exits.
         """
         self.print_usage(sys.stderr)
-        #FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
+        # FIXME(lzyeval): if changes occur in argparse.ArgParser._check_value
         choose_from = ' (choose from'
         progparts = self.prog.partition(' ')
         self.exit(2, "error: %(errmsg)s\nTry '%(mainp)s help %(subp)s'"
@@ -540,7 +540,7 @@ class LibraShell(object):
 
         os_password = None
 
-        #FIXME(usrleon): Here should be restrict for project id same as
+        # FIXME(usrleon): Here should be restrict for project id same as
         # for os_username or os_password but for compatibility it is not.
         if not cliutils.isunauthenticated(args.func):
             if auth_plugin:
diff --git a/requirements.txt b/requirements.txt
index b277c11..14414a5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-python_novaclient>=2.14.1,<2.14.2
+python_novaclient>=2.14.1,!=2.14.2
 PrettyTable>=0.7,<0.8
 babel
 stevedore
diff --git a/tests/test_lbaas_client.py b/tests/test_lbaas_client.py
new file mode 100644
index 0000000..5d058ec
--- /dev/null
+++ b/tests/test_lbaas_client.py
@@ -0,0 +1,7 @@
+import testtools
+
+
+class test_dummy(testtools.TestCase):
+
+    def test_dummy(self):
+        self.assertEqual(1, 1)