← Back to branch summary

~mthaddon/charms/trusty/nova-compute/virsh-memcheck-nagios

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/context.py

  • Committer: james.page at ubuntu
  • Date: 2014-05-21 10:04:25 UTC
  • mfrom: (60.1.1 nova-compute)
  • Revision ID: james.page@ubuntu.com-20140521100425-00z6gamxzizyuc9n
[tribaal,r=james-page,t=james-page]

Resync helpers to pickup fixes for apt lock races and better block device detection and handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/context.py
570
570
 
571
571
        if self.plugin == 'ovs':
572
572
            ctxt.update(self.ovs_ctxt())
573
 
        elif self.plugin == 'nvp':
 
573
        elif self.plugin in ['nvp', 'nsx']:
574
574
            ctxt.update(self.nvp_ctxt())
575
575
 
576
576
        alchemy_flags = config('neutron-alchemy-flags')