Update LISP config in default Karaf resources

The lisp.mappingOverwrite configuration option was removed in the LISP
code, and the new option lisp.mappingMerge was added. Update
etc/custom.properties accordingly.

Change-Id: Ifaf9888a36e2b5ac90e8c82122e8d4db96a02b18
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
index e2bb24e34bb906d6bbae81ddfeb6db63d86d593b..de0e8f39c2166f3cda232307b6207ab46198e6c0 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -92,8 +92,8 @@ java.util.logging.config.file=configuration/tomcat-logging.properties
 hosttracker.keyscheme=IP
 
 # LISP Flow Mapping configuration
-# Map-Register messages overwrite existing RLOC sets in EID-to-RLOC mappings (default: true)
-lisp.mappingOverwrite = true
+# Enable merging RLOC sets received from different xTR-IDs for the same EID (default: false)
+lisp.mappingMerge = false
 # Enable the Solicit-Map-Request (SMR) mechanism (default: true)
 lisp.smr = true
 # Choose policy for Explicit Locator Path (ELP) handling