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 "Added move of branding jar to assembly"
[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 234e0feb45047ed2ca14e45e2b2e1dd18432834e..f05afbb346f7f157162b313981874c4d3d6bdd40 100644
(file)
--- a/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@
-13,12
+13,12
@@
osgi.bundles=\
reference\:file\:../lib/jersey-server-1.17.jar@2:start
# Netconf startup configuration
reference\:file\:../lib/jersey-server-1.17.jar@2:start
# Netconf startup configuration
-netconf.tcp.address=127.0.0.1
-netconf.tcp.port=8383
-netconf.tcp.client.address=127.0.0.1
-netconf.tcp.client.port=8383
+# Netconf tcp address:port is optional
+#netconf.tcp.address=127.0.0.1
+#netconf.tcp.port=8383
+# Netconf tcp address:port is optional
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
@@
-143,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