X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fmain%2Fresources%2Fconfiguration%2Fconfig.ini;h=9df653cf94f00af395839711d6a347e2b1b04a0d;hb=3ae60a7780cc42f2bf5d8f44d4c1e18a6abd0642;hp=6a219c514a779b5f93775c442163d5d58b853519;hpb=5ded121bd1776ae7ab394e6d11d45319e017d7cc;p=controller.git diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index 6a219c514a..691d83d45e 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -8,50 +8,40 @@ osgi.bundles=\ reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\ reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\ reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\ - reference\:file\:../lib/logging.bridge-0.4.1-SNAPSHOT@1:start,\ + reference\:file\:../lib/logging.bridge-${logging.bridge.version}@1:start,\ reference\:file\:../lib/jersey-core-1.17.jar@2:start,\ reference\:file\:../lib/jersey-server-1.17.jar@2:start # Netconf startup configuration -netconf.tcp.address=0.0.0.0 -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.default.user = netconf +netconf.ssh.default.password = netconf netconf.config.persister.active=1,2 # read startup configuration -#netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.DirectoryStorageAdapter -#netconf.config.persister.1.properties.directoryStorage=configuration/initial/ -#netconf.config.persister.1.readonly=true - -netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.autodetect.AutodetectDirectoryStorageAdapter +netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter netconf.config.persister.1.properties.directoryStorage=configuration/initial/ +# include only xml files, files with other extensions will be skipped, multiple extensions are permitted e.g. netconf.config.persister.1.properties.includeExtensions=xml,cfg,config +netconf.config.persister.1.properties.includeExtensions=xml netconf.config.persister.1.readonly=true -#netconf.config.persister.3.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter -#netconf.config.persister.3.properties.directoryStorage=configuration/initialXml/ -#netconf.config.persister.3.readonly=true - -#netconf.config.persister.4.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.FileStorageAdapter -#netconf.config.persister.4.properties.fileStorage=configuration/current/controller.currentconfig.txt -#netconf.config.persister.4.properties.numberOfBackups=1 - netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml netconf.config.persister.2.properties.numberOfBackups=1 -yangstore.blacklist=.*controller.model.*|.*ietf-topology - # Set Default start level for framework osgi.bundles.defaultStartLevel=4 # Extra packages to import from the boot class loader -org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc +org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch # This is not Eclipse App eclipse.ignoreApp=true # Don't shutdown equinox if the eclipse App has ended, @@ -59,9 +49,12 @@ eclipse.ignoreApp=true osgi.noShutdown=true # Clean any cached data on restart of the framework osgi.clean=true + +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578 # Extend the framework to avoid the resources to be presented with # a URL of type bundleresource: but to be presented as file: osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator + # Directory from where the fileinstall will monitor for new bundles felix.fileinstall.dir=./plugins # Immediately learn new bundles at startup @@ -83,6 +76,7 @@ connection.scheme = ANY_CONTROLLER_ONE_MASTER # Embedded Tomcat configuration File org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml +org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true # Open Flow related system parameters # TCP port on which the controller is listening (default 6633) @@ -114,6 +108,23 @@ org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml # The maximum number of ports handled in one discovery batch (default 512) # of.discoveryBatchMaxPorts=512 +# OVSDB configuration +# ovsdb plugin supports both active and passive connections. It listens on port 6640 by default for Active connections. +ovsdb.listenPort=6640 + +# ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version. +# default Openflow version = 1.3, we also support 1.0. +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.l3gateway.mac=00:00:5E:00:02:01 + # TLS configuration # To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. # The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate @@ -141,3 +152,12 @@ 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 + +#RESTConf websocket listen port (default is 8181) +restconf.websocket.port=8181