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 1888 - FRM Flow Listener registration fail"
[controller.git]
/
opendaylight
/
distribution
/
opendaylight-karaf-resources
/
src
/
main
/
resources
/
etc
/
custom.properties
diff --git
a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
b/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
index 8a2aa59dfe59d2e9fb9ec9f0ab27abb6f89df11e..cdb65420135d1f71ebe1e66eb67dec8efda762dd 100644
(file)
--- a/
opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/
opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@
-119,7
+119,7
@@
controllerTrustStorePassword=
enableStrongPasswordCheck = false
#Jolokia configurations
enableStrongPasswordCheck = false
#Jolokia configurations
-org.jolokia.listenForHttpService=false
+
#
org.jolokia.listenForHttpService=false
# Logging configuration for Tomcat-JUL logging
java.util.logging.config.file=configuration/tomcat-logging.properties
# Logging configuration for Tomcat-JUL logging
java.util.logging.config.file=configuration/tomcat-logging.properties
@@
-127,3
+127,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
+