From: Giovanni Meo Date: Fri, 16 May 2014 08:24:09 +0000 (+0000) Subject: Merge "Add lispflowmapping specific configuration options" X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~82 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=66249d6ccc367fad055a269f561860d2d96af385;hp=04a788d2df5303c60cdbcff02254291f411566bd Merge "Add lispflowmapping specific configuration options" --- diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index 234e0feb45..c958039b5f 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -143,3 +143,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