← Back to branch summary

~hopem/charms/trusty/nova-compute/lp1518975

« back to all changes in this revision

Viewing changes to hooks/nova_compute_utils.py

  • Committer: James Page
  • Date: 2015-10-30 05:49:18 UTC
  • mto: This revision was merged to the branch mainline in revision 179.
  • Revision ID: james.page@ubuntu.com-20151030054918-jhtetwn9b8we7m8m
Add tox support

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_utils.py
299
299
 
300
300
            conf = neutron_plugin_attribute(plugin, 'config', net_manager)
301
301
            svcs = neutron_plugin_attribute(plugin, 'services', net_manager)
302
 
            ctxts = (neutron_plugin_attribute(plugin, 'contexts', net_manager)
303
 
                     or [])
 
302
            ctxts = (neutron_plugin_attribute(plugin,
 
303
                                              'contexts', net_manager) or
 
304
                     [])
304
305
            resource_map[conf] = {}
305
306
            resource_map[conf]['services'] = svcs
306
307
            resource_map[conf]['contexts'] = ctxts
373
374
    if (net_manager in ['flatmanager', 'flatdhcpmanager'] and
374
375
            config('multi-host').lower() == 'yes'):
375
376
        packages.extend(['nova-api', 'nova-network'])
376
 
    elif (net_manager in ['quantum', 'neutron']
377
 
            and neutron_plugin_legacy_mode()):
 
377
    elif (net_manager in ['quantum', 'neutron'] and
 
378
            neutron_plugin_legacy_mode()):
378
379
        plugin = neutron_plugin()
379
380
        pkg_lists = neutron_plugin_attribute(plugin, 'packages', net_manager)
380
381
        for pkg_list in pkg_lists: