From: Lorand Jakab <lojakab@cisco.com>
Date: Mon, 15 Sep 2014 21:01:47 +0000 (+0300)
Subject: Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf
X-Git-Tag: release/helium~60^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=bb91c4a33c28e2fb4bd1783310c5c607c581772e;hp=1048cce77e241a1bdd152209dfae9ce13847e41c

Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf

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

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 e0e2759b37..cdb6542013 100644
--- a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -127,3 +127,9 @@ java.util.logging.config.file=configuration/tomcat-logging.properties
 #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
+