Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-5932: Remove NETCONF startup knobs
[controller.git]
/
karaf
/
opendaylight-karaf-resources
/
src
/
main
/
resources
/
etc
/
custom.properties
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 ab16bf8621823fa599524b9b6090e5906d21622f..71b975d8a6ca93b0418d372f2989b2e126043651 100644
(file)
--- a/
karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/
karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@
-13,15
+13,7
@@
org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
# Use Equinox as default OSGi Framework Implementation
karaf.framework=equinox
# Use Equinox as default OSGi Framework Implementation
karaf.framework=equinox
-# Netconf startup configuration
-netconf.tcp.address=127.0.0.1
-netconf.tcp.port=8383
-
-netconf.tcp.client.address=127.0.0.1
-netconf.tcp.client.port=8383
-
-netconf.ssh.address=0.0.0.0
-netconf.ssh.port=1830
+# Use Linux style path
netconf.ssh.pk.path = ./configuration/RSA.pk
# Set security provider to BouncyCastle
org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider
netconf.ssh.pk.path = ./configuration/RSA.pk
# Set security provider to BouncyCastle
org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider
@@
-84,6
+76,9
@@
ovsdb.listenPort=6640
# disabled by default.
# ovsdb.l3.fwd.enabled=yes
# disabled by default.
# ovsdb.l3.fwd.enabled=yes
+# ovsdb can be configured with ml2 to perform arp responder, enabled by default.
+ovsdb.l3.arp.responder.disabled=no
+
# 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.