Merge "HostTracker hosts DB key scheme implementation"

[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 b0ad555bee55e17be3611dc6e6fb5dfd8f3d744d..bfc3962040de008313256355ae917948d0caf5e4 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -14,7 +14,7 @@ osgi.bundles=\
     reference\:file\:../lib/jersey-server-1.17.jar@2:start
 
 # Netconf startup configuration
-netconf.tcp.address=127.0.0.1
+netconf.tcp.address=0.0.0.0
 netconf.tcp.port=8383
 
 #netconf.tls.address=127.0.0.1
@@ -22,7 +22,10 @@ netconf.tcp.port=8383
 #netconf.tls.keystore=
 #netconf.tls.keystore.password=
 
-netconf.config.persister.storageAdapterClass=org.opendaylight.controller.netconf.persist.impl.NoOpStorageAdapter
+netconf.config.persister.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter
+fileStorage=configuration/controller.config
+numberOfBackups=1
+yangstore.blacklist=.*controller.model.*
 
 # Set Default start level for framework
 osgi.bundles.defaultStartLevel=4
@@ -111,3 +114,9 @@ enableStrongPasswordCheck = false
 
 #Jolokia configurations
 org.jolokia.listenForHttpService=false
+
+# Logging configuration for Tomcat-JUL logging
+java.util.logging.config.file=configuration/tomcat-logging.properties
+
+#Hosttracker hostsdb key scheme setting
+hosttracker.keyscheme=IP