Merge lp:~ajkavanagh/charm-helpers/fix-novaclient-v1_1 into lp:charm-helpers

[Alex Kavanagh]

  Fix lp:1555643 - c.o.amulet.utils imports removed novaclient.v1_1 module

  As per http://docs.openstack.org/developer/python-novaclient/api.html
  the novaclient module needs to be imported as:

  from novaclient import client
  c = client.Client(VERSION, ...)

  as opposed to

  from novaclient.VERSION import client
  c = client.Client(...)

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2016-03-11 10:58:21 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2016-03-15 14:18:58 +0000
@@ -31,7 +31,7 @@
 from keystoneclient import session as keystone_session
 from keystoneclient.v3 import client as keystone_client_v3
 
-import novaclient.v1_1.client as nova_client
+import novaclient.client as nova_client
 import pika
 import swiftclient
 
@@ -42,6 +42,8 @@
 DEBUG = logging.DEBUG
 ERROR = logging.ERROR
 
+NOVA_CLIENT_VERSION = "2"
+
 
 class OpenStackAmuletUtils(AmuletUtils):
     """OpenStack amulet utilities.
@@ -249,7 +251,8 @@
         self.log.debug('Authenticating nova user ({})...'.format(user))
         ep = keystone.service_catalog.url_for(service_type='identity',
                                               endpoint_type='publicURL')
-        return nova_client.Client(username=user, api_key=password,
+        return nova_client.Client(NOVA_CLIENT_VERSION,
+                                  username=user, api_key=password,
                                   project_id=tenant, auth_url=ep)
 
     def authenticate_swift_user(self, keystone, user, password, tenant):