| commit | 65fc49e283cfd3d2a130fe85bd6ceafed1ba040f | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Sep 26 18:18:46 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Sep 26 18:18:46 2016 +0000 |
| tree | 46d27293d387841554f27ef92b13f6f25141a201 | |
| parent | 9cea4e8570f6a7e1d022bf9eae09223d3144c695 [diff] | |
| parent | 11817482c03b3994cde93320f138d5a7ccd821d3 [diff] |
Merge "lib/neutron: Use NEUTRON_PLUGIN instead of hardcoding ml2"
diff --git a/lib/neutron b/lib/neutron index c497559..ab84f7e 100644 --- a/lib/neutron +++ b/lib/neutron
@@ -139,7 +139,7 @@ cp $NEUTRON_DIR/etc/api-paste.ini $NEUTRON_CONF_DIR/api-paste.ini - iniset $NEUTRON_CONF DEFAULT core_plugin ml2 + iniset $NEUTRON_CONF DEFAULT core_plugin $NEUTRON_PLUGIN iniset $NEUTRON_CONF DEFAULT policy_file $policy_file iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips True