← Back to branch summary

~gnuoy/charms/trusty/nova-compute/1496746

« back to all changes in this revision

Viewing changes to hooks/nova_compute_context.py

  • Committer: Corey Bryant
  • Date: 2015-07-17 15:40:58 UTC
  • mfrom: (141.1.4 nova-compute)
  • Revision ID: corey.bryant@canonical.com-20150717154058-4rttn9ueccethsc7
[james-page,r=gnuoy] ovs and neutron-plugin context updates.

* Only install packages and create bridges if operating in legacy mode.
* Consume data from neutron-plugin subordinates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova_compute_context.py
444
444
        if not ovs_ctxt:
445
445
            return {}
446
446
 
447
 
        self._ensure_bridge()
 
447
        if config('manage-neutron-plugin-legacy-mode'):
 
448
            self._ensure_packages()
 
449
            self._ensure_bridge()
448
450
 
449
451
        ovs_ctxt['local_ip'] = \
450
452
            get_address_in_network(config('os-data-network'),