Merge lp:~ajkavanagh/ubuntu/precise/serverstack-dns/update-python-novaclient-usage into lp:~openstack-charmers/ubuntu/precise/serverstack-dns/trunk

[Alex Kavanagh]

Update serverstack-dns to work with xenial version of python-novaclient (3.2+) were the deprecated novaclient.v1_1 module has been removed.
Updated the instantiation of Client() to include the api version with "2".

=== modified file 'serverstack-tenant-dns'
--- serverstack-tenant-dns	2015-11-18 14:31:10 +0000
+++ serverstack-tenant-dns	2016-03-07 18:15:21 +0000
@@ -9,7 +9,7 @@
 from subprocess import check_call
 
 from kombu import Connection, Exchange, Queue
-from novaclient.v1_1 import client
+from novaclient import client
 
 CONFIG_FILE = '/etc/serverstack-dns/dns.conf'
 
@@ -112,7 +112,7 @@
     global _client
     if _client is not None:
         return _client
-    _client = client.Client(config['os_username'], config['os_password'],
+    _client = client.Client("2", config['os_username'], config['os_password'],
                             config['os_tenant_name'], config['os_auth_url'],
                             service_type='compute')
     return _client