Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1036 - Allow using container in case stmt to preserve uniqueness."
[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 9d0d6c1888a480aa96042fc2c7824aaf41b5ecbf..c958039b5f0465206626eb009e33385df5b11d2f 100644
(file)
--- a/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@
-22,6
+22,8
@@
netconf.tcp.client.port=8383
netconf.ssh.address=0.0.0.0
netconf.ssh.port=1830
netconf.ssh.pk.path = ./configuration/RSA.pk
netconf.ssh.address=0.0.0.0
netconf.ssh.port=1830
netconf.ssh.pk.path = ./configuration/RSA.pk
+netconf.ssh.default.user = netconf
+netconf.ssh.default.password = netconf
netconf.config.persister.active=1,2
netconf.config.persister.active=1,2
@@
-141,3
+143,9
@@
java.util.logging.config.file=configuration/tomcat-logging.properties
#Hosttracker hostsdb key scheme setting
hosttracker.keyscheme=IP
#Hosttracker hostsdb key scheme setting
hosttracker.keyscheme=IP
+
+# LISP Flow Mapping configuration
+# Map-Register messages overwrite existing RLOC sets in EID-to-RLOC mappings
+lisp.mappingOverwrite = true
+# Enable the Solicit-Map-Request (SMR) mechanism
+lisp.smr = false