Merge "Removed ml2_conf_odl.ini config file" into stable/kilo

etc/neutron/plugins/ml2/ml2_conf_odl.ini

@@ -1,30 +0,0 @@
-# Configuration for the OpenDaylight MechanismDriver
-
-[ml2_odl]
-# (StrOpt) OpenDaylight REST URL
-# If this is not set then no HTTP requests will be made.
-#
-# url =
-# Example: url = http://192.168.56.1:8080/controller/nb/v2/neutron
-
-# (StrOpt) Username for HTTP basic authentication to ODL.
-#
-# username =
-# Example: username = admin
-
-# (StrOpt) Password for HTTP basic authentication to ODL.
-#
-# password =
-# Example: password = admin
-
-# (IntOpt) Timeout in seconds to wait for ODL HTTP request completion.
-# This is an optional parameter, default value is 10 seconds.
-#
-# timeout = 10
-# Example: timeout = 15
-
-# (IntOpt) Timeout in minutes to wait for a Tomcat session timeout.
-# This is an optional parameter, default value is 30 minutes.
-#
-# session_timeout = 30
-# Example: session_timeout = 60

setup.cfg

@@ -69,7 +69,6 @@ data_files =
         etc/neutron/plugins/ml2/ml2_conf_cisco.ini
         etc/neutron/plugins/ml2/ml2_conf_mlnx.ini
         etc/neutron/plugins/ml2/ml2_conf_ncs.ini
-        etc/neutron/plugins/ml2/ml2_conf_odl.ini
         etc/neutron/plugins/ml2/ml2_conf_ofa.ini
         etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini
         etc/neutron/plugins/ml2/ml2_conf_sriov.ini