← Back to branch summary

~niedbalski/ubuntu/vivid/neutron/fixes-1447803

« back to all changes in this revision

Viewing changes to neutron/agent/securitygroups_rpc.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-10-03 18:45:23 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20141003184523-4mt6dy1q3j8n30c9
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1323729
* New upstream release candidate:
  - d/p/*: Refreshed.
  - d/control: Add python-requests-mock to BD's.
  - d/control: Align versioned requirements with upstream.
* Transition linuxbridge and openvswitch plugin users to modular
  layer 2 plugin (LP: #1323729):
  - d/control: Mark removed plugin packages as transitional, depend
    on neutron-plugin-ml2, mark oldlibs/extra.
  - d/neutron-plugin-{linuxbridge,openvswitch}.install: Drop.
  - d/control: Depend on neutron-plugin-ml2 for linuxbridge
    agent package.
  - d/neutron-plugin-linuxbridge-agent.upstart: Use ml2 plugin
    configuration files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/agent/securitygroups_rpc.py
37
37
        help=_(
38
38
            'Controls whether the neutron security group API is enabled '
39
39
            'in the server. It should be false when using no security '
40
 
            'groups or using the nova security group API.'))
 
40
            'groups or using the nova security group API.')),
 
41
    cfg.BoolOpt(
 
42
        'enable_ipset',
 
43
        default=True,
 
44
        help=_('Use ipset to speed-up the iptables based security groups.'))
41
45
]
42
46
cfg.CONF.register_opts(security_group_opts, 'SECURITYGROUP')
43
47