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 "Added validation for protocol field while adding flow"
[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 ba1a54b662f3f4c68d328bc5390c57239c2d451e..12f18ff6452b1cbec6f9a6d4bec1c6949b1d2836 100644
(file)
--- a/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/
opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@
-40,6
+40,12
@@
felix.fileinstall.filter=^(?!org.apache.felix.fileinstall).*
# logback configuration
logback.configurationFile=configuration/logback.xml
# logback configuration
logback.configurationFile=configuration/logback.xml
+# Container configuration
+container.profile = Container
+
+# Connection manager configuration
+connection.scheme = ANY_CONTROLLER_ONE_MASTER
+
# Embedded Tomcat configuration File
org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml
# Embedded Tomcat configuration File
org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml
@@
-88,3
+94,6
@@
controllerKeyStore=
controllerKeyStorePassword=
controllerTrustStore=
controllerTrustStorePassword=
controllerKeyStorePassword=
controllerTrustStore=
controllerTrustStorePassword=
+
+# User Manager configurations
+enableStrongPasswordCheck = false