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 1328: Improved argument checks in generated RPC Router"
[controller.git]
/
opendaylight
/
distribution
/
opendaylight
/
src
/
main
/
resources
/
configuration
/
config.ini
diff --git
a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index c958039b5f0465206626eb009e33385df5b11d2f..f4bf4835796aa5536d8cc9b7f4c4bdeda826a373 100644
(file)
--- a/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@
-13,12
+13,12
@@
osgi.bundles=\
reference\:file\:../lib/jersey-server-1.17.jar@2:start
# Netconf startup configuration
reference\:file\:../lib/jersey-server-1.17.jar@2:start
# 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 tcp address:port is optional
+#netconf.tcp.address=127.0.0.1
+#netconf.tcp.port=8383
+# Netconf tcp address:port is optional
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
@@
-113,8
+113,8
@@
org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
ovsdb.listenPort=6640
# ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version.
ovsdb.listenPort=6640
# ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version.
-# default Openflow version = 1.
0, we also support 1.3
.
-
#
ovsdb.of.version=1.3
+# default Openflow version = 1.
3, we also support 1.0
.
+ovsdb.of.version=1.3
# TLS configuration
# To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files.
# TLS configuration
# To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files.