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-1845: implement proper shutdown sequence"
[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 a644bf6ee835f0434ec6f4a1678dc48f3fcf9cf2..4a8f5ae795f7541d38793498f1570227febfd979 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
@@
-37,6
+37,8
@@
netconf.tcp.client.port=8383
netconf.ssh.address=0.0.0.0
netconf.ssh.port=1830
netconf.ssh.pk.path = ./configuration/RSA.pk
netconf.ssh.address=0.0.0.0
netconf.ssh.port=1830
netconf.ssh.pk.path = ./configuration/RSA.pk
+# Set security provider to BouncyCastle
+org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider
netconf.config.persister.active=1
netconf.config.persister.active=1
@@
-92,6
+94,10
@@
ovsdb.listenPort=6640
# default Openflow version = 1.0, we also support 1.3.
# ovsdb.of.version=1.3
# default Openflow version = 1.0, we also support 1.3.
# ovsdb.of.version=1.3
+# ovsdb can be configured with ml2 to perform l3 forwarding. The config below enables that functionality, which is
+# disabled by default.
+# ovsdb.l3.fwd.enabled=yes
+
# ovsdb can be configured with ml2 to perform l3 forwarding. When used in that scenario, the mac address of the default
# gateway --on the external subnet-- is expected to be resolved from its inet address. The config below overrides that
# specific arp/neighDiscovery lookup.
# ovsdb can be configured with ml2 to perform l3 forwarding. When used in that scenario, the mac address of the default
# gateway --on the external subnet-- is expected to be resolved from its inet address. The config below overrides that
# specific arp/neighDiscovery lookup.
@@
-117,7
+123,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
@@
-125,3
+131,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
+