From a33325d5637936ef58a818df8e38363a37efc888 Mon Sep 17 00:00:00 2001 From: David Della Vecchia Date: Mon, 9 Nov 2015 14:06:56 +0000 Subject: [PATCH] Fixing config description and dropping icehouse template changes --- config.yaml | 2 +- templates/icehouse/ml2_conf.ini | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index 1c08351a..93f4fdb6 100755 --- a/config.yaml +++ b/config.yaml @@ -456,4 +456,4 @@ options: enable-ml2-port-security: type: boolean default: False - description: If True enables port security extension for ML2 plugin. + description: Enable port security extension for ML2 plugin (>= kilo). diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini index cebd1fe3..f6bbaf64 100644 --- a/templates/icehouse/ml2_conf.ini +++ b/templates/icehouse/ml2_conf.ini @@ -4,10 +4,6 @@ # Configuration file maintained by Juju. Local changes may be overwritten. ############################################################################### [ml2] -{% if enable_ml2_port_security -%} -extension_drivers=port_security -{% endif -%} - {% if neutron_plugin == 'Calico' -%} type_drivers = local,flat mechanism_drivers = calico