← Back to branch summary

~hopem/charms/trusty/neutron-openvswitch/ensure-tmpdir-cleanup

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-04-16 10:30:12 UTC
  • Revision ID: liam.young@canonical.com-20150416103012-it2xr0rv3jc3b82w
[gnuoy,trivial] Pre-release charmhelper sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/context.py
808
808
 
809
809
        return ovs_ctxt
810
810
 
 
811
    def nuage_ctxt(self):
 
812
        driver = neutron_plugin_attribute(self.plugin, 'driver',
 
813
                                          self.network_manager)
 
814
        config = neutron_plugin_attribute(self.plugin, 'config',
 
815
                                          self.network_manager)
 
816
        nuage_ctxt = {'core_plugin': driver,
 
817
                      'neutron_plugin': 'vsp',
 
818
                      'neutron_security_groups': self.neutron_security_groups,
 
819
                      'local_ip': unit_private_ip(),
 
820
                      'config': config}
 
821
 
 
822
        return nuage_ctxt
 
823
 
811
824
    def nvp_ctxt(self):
812
825
        driver = neutron_plugin_attribute(self.plugin, 'driver',
813
826
                                          self.network_manager)
891
904
            ctxt.update(self.n1kv_ctxt())
892
905
        elif self.plugin == 'Calico':
893
906
            ctxt.update(self.calico_ctxt())
 
907
        elif self.plugin == 'vsp':
 
908
            ctxt.update(self.nuage_ctxt())
894
909
 
895
910
        alchemy_flags = config('neutron-alchemy-flags')
896
911
        if alchemy_flags: