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

Proposed by Alex Kavanagh on 2016-03-07
Status: Merged
Merged at revision: 15
Proposed branch: lp:~ajkavanagh/ubuntu/precise/serverstack-dns/update-python-novaclient-usage
Merge into: lp:~openstack-charmers/ubuntu/precise/serverstack-dns/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
serverstack-tenant-dns (+2/-2)
To merge this branch: bzr merge lp:~ajkavanagh/ubuntu/precise/serverstack-dns/update-python-novaclient-usage
Reviewer Review Type Date Requested Status
James Page 2016-03-07 Pending
Review via email: mp+288329@code.launchpad.net

Description of the Change

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".

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverstack-tenant-dns'
2--- serverstack-tenant-dns 2015-11-18 14:31:10 +0000
3+++ serverstack-tenant-dns 2016-03-07 18:15:21 +0000
4@@ -9,7 +9,7 @@
5 from subprocess import check_call
6
7 from kombu import Connection, Exchange, Queue
8-from novaclient.v1_1 import client
9+from novaclient import client
10
11 CONFIG_FILE = '/etc/serverstack-dns/dns.conf'
12
13@@ -112,7 +112,7 @@
14 global _client
15 if _client is not None:
16 return _client
17- _client = client.Client(config['os_username'], config['os_password'],
18+ _client = client.Client("2", config['os_username'], config['os_password'],
19 config['os_tenant_name'], config['os_auth_url'],
20 service_type='compute')
21 return _client

Subscribers

People subscribed via source and target branches