openstack/charm-neutron-api
Code Issues Proposed changes

Fixing config description and dropping icehouse template changes

Browse Source
This commit is contained in:
David Della Vecchia 2015-11-09 14:06:56 +00:00
parent 39f99a64b8
commit a33325d563
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -456,4 +456,4 @@ options:
enable-ml2-port-security: enable-ml2-port-security:
type: boolean type: boolean
default: False default: False
description: If True enables port security extension for ML2 plugin. description: Enable port security extension for ML2 plugin (>= kilo).

4
templates/icehouse/ml2_conf.ini
View File

@ -4,10 +4,6 @@
# Configuration file maintained by Juju. Local changes may be overwritten. # Configuration file maintained by Juju. Local changes may be overwritten.
############################################################################### ###############################################################################
[ml2] [ml2]
{% if enable_ml2_port_security -%}
extension_drivers=port_security
{% endif -%}
{% if neutron_plugin == 'Calico' -%} {% if neutron_plugin == 'Calico' -%}
type_drivers = local,flat type_drivers = local,flat
mechanism_drivers = calico mechanism_drivers = calico