← Back to branch summary

~ubuntu-branches/ubuntu/trusty/neutron/trusty-security

« back to all changes in this revision

Viewing changes to neutron/plugins/nec/common/config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2014-04-09 08:51:40 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20140409085140-4amipmh308opyizx
Tags: 1:2014.1~rc2-0ubuntu1
https://launchpad.net/bugs/1301957
https://launchpad.net/bugs/1303876
https://launchpad.net/bugs/1288245
[ James Page ]
* d/neutron-plugin-oneconvergence-agent.upstart: Rename upstart
  configuration to match package name (LP: #1301957).
* d/neutron-vpn-agent.install: Install missing vpnaas.filters for
  rootwrap (LP: #1303876).

[ Chuck Short ]
* New upstream release candidate (LP: #1288245).

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/plugins/nec/common/config.py
51
51
               help=_("Key file")),
52
52
    cfg.StrOpt('cert_file', default=None,
53
53
               help=_("Certificate file")),
 
54
    cfg.BoolOpt('insecure_ssl', default=False,
 
55
                help=_("Disable SSL certificate verification")),
54
56
    cfg.IntOpt('api_max_attempts', default=3,
55
57
               help=_("Maximum attempts per OFC API request."
56
58
                      "NEC plugin retries API request to OFC "