X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fmain%2Fresources%2Fconfiguration%2Fconfig.ini;h=6e8a3555234ef8cd668a048fd299eddac823656e;hb=dd018bda91b9c3cd222aaa1bd2d8f734152571e8;hp=33789ee2d28e75cde71be02b36084cff12aceb27;hpb=c85c9112b0db092bd565bcf9e5174ecfa67ae1d2;p=controller.git

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 33789ee2d2..6e8a355523 100644
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -1,13 +1,13 @@
 osgi.bundles=\
-	reference\:file\:../lib/org.apache.felix.fileinstall-3.1.6.jar@1:start,\
-	reference\:file\:../lib/org.eclipse.jdt.core.compiler.batch-3.8.0.I20120518-2145.jar@1:start,\
-	reference\:file\:../lib/org.eclipse.equinox.ds-1.4.0.v20120522-1841.jar@2:start,\
-	reference\:file\:../lib/org.eclipse.equinox.util-1.0.400.v20120522-2049.jar@2:start,\
-	reference\:file\:../lib/org.eclipse.osgi.services-3.3.100.v20120522-1822@2:start,\
-	reference\:file\:../lib/org.eclipse.equinox.console-1.0.0.v20120522-1841.jar@start,\
-	reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\
-	reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\
-	reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\
+    reference\:file\:../lib/org.apache.felix.fileinstall-3.1.6.jar@1:start,\
+    reference\:file\:../lib/org.eclipse.jdt.core.compiler.batch-3.8.0.I20120518-2145.jar@1:start,\
+    reference\:file\:../lib/org.eclipse.equinox.ds-1.4.0.v20120522-1841.jar@2:start,\
+    reference\:file\:../lib/org.eclipse.equinox.util-1.0.400.v20120522-2049.jar@2:start,\
+    reference\:file\:../lib/org.eclipse.osgi.services-3.3.100.v20120522-1822@2:start,\
+    reference\:file\:../lib/org.eclipse.equinox.console-1.0.0.v20120522-1841.jar@start,\
+    reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\
+    reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\
+    reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\
     reference\:file\:../lib/logging.bridge-0.4.0-SNAPSHOT@1:start,\
     reference\:file\:../lib/jersey-core-1.17.jar@2:start,\
     reference\:file\:../lib/jersey-json-1.17.jar@2:start,\
@@ -19,7 +19,7 @@ osgi.bundles.defaultStartLevel=4
 org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc
 # This is not Eclipse App
 eclipse.ignoreApp=true
-# Don't shutdown equinox if the eclipse App has ended, 
+# Don't shutdown equinox if the eclipse App has ended,
 # which is our case because we are not running any eclipse application
 osgi.noShutdown=true
 # Clean any cached data on restart of the framework
@@ -33,7 +33,7 @@ felix.fileinstall.dir=./plugins
 felix.fileinstall.noInitialDelay=true
 # Auto start the bundles at level 4
 felix.fileinstall.start.level=4
-# Avoid to auto-install following bundles, that means those need 
+# Avoid to auto-install following bundles, that means those need
 # to be started manually or in other way like osgi.bundles
 felix.fileinstall.filter=^(?!org.apache.felix.fileinstall).*
 
@@ -56,16 +56,22 @@ org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml
 # of.portStatsPollInterval=5
 # The description statistics polling interval in second (default 60 sec)
 # of.descStatsPollInterval=60
+# The table statistics polling interval in second (default 10 sec)
+# of.tableStatsPollInterval=10
 # The maximum number of asynchronous messages can be sent before sending a Barrier Request (default 100)
 # of.barrierMessagePriorCount=100
 # The interval which determines how often the discovery packets should be sent (default 300 sec)
 # of.discoveryInterval=300
-# The timeout value in waiting for returned discovery packet (default 60 sec)
-# of.discoveryTimeout=60
+# The timeout multiple of discovery interval
+# of.discoveryTimeoutMultiple=2
+# For newly added ports, allow one more retry if the elapsed time exceeds this threshold (default 10 sec)
+# of.discoveryThreshold=10
+# The maximum number of ports handled in one discovery batch (default 1024)
+# of.discoveryBatchMaxPorts=1024
 
 # TLS configuration
 # To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files.
-# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate 
+# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate
 # entries, including switches' Certification Authority (CA) certificates. For example,
 # secureChannelEnabled=true
 # controllerKeyStore=./configuration/ctlKeyStore