From: Madhu Venugopal Date: Tue, 16 Sep 2014 17:49:02 +0000 (+0000) Subject: Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf" X-Git-Tag: release/helium~60 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=70c27e8bf6d323376a78aa5468faf4f27d081638;hp=592ff3cd9e1b80d4cbd9ca45ed4a2371377a7622 Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf" --- 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 +