Browse code

Merge "add the port_sec as default neutron/ml2 extension driver"

Jenkins authored on 2015/05/27 23:41:41
Showing 2 changed files
... ...
@@ -131,6 +131,11 @@ In this configuration we are defining FLOATING_RANGE to be a
131 131
 subnet that exists in the private RFC1918 address space - however in
132 132
 in a real setup FLOATING_RANGE would be a public IP address range.
133 133
 
134
+Note that extension drivers for the ML2 plugin is set by
135
+`Q_ML2_PLUGIN_EXT_DRIVERS`, and it includes 'port_security' by default. If you
136
+want to remove all the extension drivers (even 'port_security'), set
137
+`Q_ML2_PLUGIN_EXT_DRIVERS` to blank.
138
+
134 139
 Neutron Networking with Open vSwitch and Provider Networks
135 140
 ==========================================================
136 141
 
... ...
@@ -31,6 +31,9 @@ Q_ML2_PLUGIN_GRE_TYPE_OPTIONS=${Q_ML2_PLUGIN_GRE_TYPE_OPTIONS:-tunnel_id_ranges=
31 31
 Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS:-vni_ranges=1001:2000}
32 32
 # Default VLAN TypeDriver options
33 33
 Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-}
34
+# List of extension drivers to load, use '-' instead of ':-' to allow people to
35
+# explicitly override this to blank
36
+Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS-port_security}
34 37
 
35 38
 # L3 Plugin to load for ML2
36 39
 ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
... ...
@@ -113,6 +116,8 @@ function neutron_plugin_configure_service {
113 113
 
114 114
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS
115 115
 
116
+    populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 extension_drivers=$Q_ML2_PLUGIN_EXT_DRIVERS
117
+
116 118
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 $Q_SRV_EXTRA_OPTS
117 119
 
118 120
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_gre $Q_ML2_PLUGIN_GRE_TYPE_OPTIONS