From 546d514f87c719cb3b480db4d651cdbf97c83013 Mon Sep 17 00:00:00 2001
From: Vadim Kuznetsov <vadim.kuznetsov@gmail.com>
Date: Tue, 4 Mar 2014 18:46:42 -0500
Subject: [PATCH] bug 5959: https://github.com/ansible/ansible/issues/5959

---
 library/cloud/nova_keypair | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cloud/nova_keypair b/library/cloud/nova_keypair
index 19d3fa49b9..18674a1220 100644
--- a/library/cloud/nova_keypair
+++ b/library/cloud/nova_keypair
@@ -18,7 +18,7 @@
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.
 
 try:
-    from novaclient.v1_1 import client
+    from novaclient.v1_1 import client as nova_client
     from novaclient import exceptions
     import time
 except ImportError: