From 9f971222ca7081fb5be5965d4d9f3d409bf4e642 Mon Sep 17 00:00:00 2001 From: David Della Vecchia Date: Thu, 5 Nov 2015 13:26:23 +0000 Subject: [PATCH] Adding ML2 port security plugin config option and template output --- config.yaml | 4 ++++ templates/icehouse/ml2_conf.ini | 4 ++++ templates/kilo/ml2_conf.ini | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/config.yaml b/config.yaml index 96d3bdb4..7d8e81d4 100644 --- a/config.yaml +++ b/config.yaml @@ -408,3 +408,7 @@ options: wait for you to execute the openstack-upgrade action for this charm on each unit. If False it will revert to existing behavior of upgrading all units on config change. + enable-ml2-port-security: + type: boolean + default: False + description: If True enables port security extension for ML2 plugin. diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini index f6bbaf64..65e6eaa5 100644 --- a/templates/icehouse/ml2_conf.ini +++ b/templates/icehouse/ml2_conf.ini @@ -4,6 +4,10 @@ # Configuration file maintained by Juju. Local changes may be overwritten. ############################################################################### [ml2] +{% if enable_ml2_port_security == 'True' -%} +extension_drivers=port_security +{% endif -%} + {% if neutron_plugin == 'Calico' -%} type_drivers = local,flat mechanism_drivers = calico diff --git a/templates/kilo/ml2_conf.ini b/templates/kilo/ml2_conf.ini index 8e055e6c..eeaccb4d 100644 --- a/templates/kilo/ml2_conf.ini +++ b/templates/kilo/ml2_conf.ini @@ -4,6 +4,10 @@ # Configuration file maintained by Juju. Local changes may be overwritten. ############################################################################### [ml2] +{% if enable_ml2_port_security == 'True' -%} +extension_drivers=port_security +{% endif -%} + {% if neutron_plugin == 'Calico' -%} type_drivers = local,flat mechanism_drivers = calico