Merge lp:~corey.bryant/charms/precise/nova-compute/1294140 into lp:~openstack-charmers/charms/precise/nova-compute/icehouse

Proposed by Corey Bryant on 2014-03-25
Status: Merged
Merged at revision: 68
Proposed branch: lp:~corey.bryant/charms/precise/nova-compute/1294140
Merge into: lp:~openstack-charmers/charms/precise/nova-compute/icehouse
Diff against target: 15 lines (+3/-2)
1 file modified
hooks/nova_compute_utils.py (+3/-2)
To merge this branch: bzr merge lp:~corey.bryant/charms/precise/nova-compute/1294140
Reviewer Review Type Date Requested Status
James Page 2014-03-25 Approve on 2014-03-25
Review via email: mp+212667@code.launchpad.net

Description of the change

Flatten net_manager packages when extending list in determine_packages()

To post a comment you must log in.
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_compute_utils.py'
2--- hooks/nova_compute_utils.py 2014-03-14 11:26:59 +0000
3+++ hooks/nova_compute_utils.py 2014-03-25 16:36:44 +0000
4@@ -230,8 +230,9 @@
5 packages.extend(['nova-api', 'nova-network'])
6 elif net_manager == 'quantum':
7 plugin = neutron_plugin()
8- packages.extend(
9- neutron_plugin_attribute(plugin, 'packages', net_manager))
10+ pkg_lists = neutron_plugin_attribute(plugin, 'packages', net_manager)
11+ for pkg_list in pkg_lists:
12+ packages.extend(pkg_list)
13
14 if relation_ids('ceph'):
15 packages.append('ceph-common')

Subscribers

People subscribed via source and target branches