From 462cbe9c5654efa83786857afe8ac05ab0711095 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 19 Feb 2015 12:06:16 -0800
Subject: [PATCH] Change references from v1_1 to v2

Because novaclient changed the directory structure.

Change-Id: I1b35ccc1befd68926614fa375893b893476ad0be
---
 nodepool/provider_manager.py | 4 ++--
 requirements.txt             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py
index ed582dfe0..dbffaae80 100644
--- a/nodepool/provider_manager.py
+++ b/nodepool/provider_manager.py
@@ -21,7 +21,7 @@ import paramiko
 import novaclient
 import novaclient.client
 import novaclient.extension
-import novaclient.v1_1.contrib.tenant_networks
+import novaclient.v2.contrib.tenant_networks
 import threading
 import glanceclient
 import glanceclient.client
@@ -285,7 +285,7 @@ class ProviderManager(TaskManager):
 
     def _getClient(self):
         tenant_networks = novaclient.extension.Extension(
-            'tenant_networks', novaclient.v1_1.contrib.tenant_networks)
+            'tenant_networks', novaclient.v2.contrib.tenant_networks)
         args = ['1.1', self.provider.username, self.provider.password,
                 self.provider.project_id, self.provider.auth_url]
         kwargs = {'extensions': [tenant_networks]}
diff --git a/requirements.txt b/requirements.txt
index 74863a546..39629dd80 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ sqlalchemy>=0.8.2,<0.9.0
 pyzmq>=13.1.0,<14.0.0
 python-glanceclient
 python-keystoneclient
-python-novaclient
+python-novaclient>=2.21.0
 PyMySQL
 PrettyTable>=0.6,<0.8
 six>=1.7.0