Merge "Add LLDP retry count to config.ini"

[controller.git] / opendaylight / distribution / opendaylight / src / main / resources / configuration / config.ini

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 1b3d1ec062c658e22194ef79ccac36151d3b715a..df4526e6f9cbac41fc4df3b07de19dc12caee8fd 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -8,7 +8,10 @@ osgi.bundles=\
        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/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,\
+    reference\:file\:../lib/jersey-server-1.17.jar@2:start
 
 # Set Default start level for framework
 osgi.bundles.defaultStartLevel=4
@@ -39,3 +42,41 @@ logback.configurationFile=configuration/logback.xml
 
 # Embedded Tomcat configuration File
 org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml
+
+# Open Flow related system parameters
+# TCP port on which the controller is listening (default 6633)
+# of.listenPort=6633
+# The time (in milliseconds) the controller will wait for a response after sending a Barrier Request or a Statistic Request message (default 2000 msec)
+# of.messageResponseTimer=2000
+# The switch liveness timeout value (default 60500 msec)
+# of.switchLivenessTimeout=60500
+# The flow statistics polling interval in second (default 10 sec)
+# of.flowStatsPollInterval=10
+# The port statistics polling interval in second (default 5 sec)
+# of.portStatsPollInterval=5
+# The description statistics polling interval in second (default 60 sec)
+# of.descStatsPollInterval=60
+# 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 number of retries after the initial discovery packet is not received within the timeout period (default 2)
+# of.discoveryRetry=2
+
+# 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 
+# entries, including switches' Certification Authority (CA) certificates. For example,
+# secureChannelEnabled=true
+# controllerKeyStore=./configuration/ctlKeyStore
+# controllerKeyStorePassword=xxxxx (this password should match the password used for KeyStore generation)
+# controllerTrustStore=./configuration/ctlTrustStore
+# controllerTrustStorePassword=xxxxx (this password should match the password used for TrustStore generation)
+
+secureChannelEnabled=false
+controllerKeyStore=
+controllerKeyStorePassword=
+controllerTrustStore=
+controllerTrustStorePassword=