Merge "HostTracker hosts DB key scheme implementation"

diff --combined opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index e7c87d7cae04604896ae13ce8b80ee8cc9d489b8,1db1d759f3c8e55d54e1a62cb4f040189f71b0dd..bfc3962040de008313256355ae917948d0caf5e4
--- 1/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
--- 2/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@@ -22,9 -22,7 +22,9 @@@ netconf.tcp.port=838
  #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
@@@ -117,3 -115,6 +117,6 @@@ org.jolokia.listenForHttpService=fals
  
  # Logging configuration for Tomcat-JUL logging
  java.util.logging.config.file=configuration/tomcat-logging.properties
+ 
+ #Hosttracker hostsdb key scheme setting
+ hosttracker.keyscheme=IP