Merge pull request #6400 from vadimkuznetsov/bug5959

bug 5959: https://github.com/ansible/ansible/issues/5959
12 years ago · 4a94a5d80a
parent 41b7badb13 546d514f87
commit 4a94a5d80a
1 changed files with 1 additions and 1 deletions
--- 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: