X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fopendaylight-karaf-resources%2Fsrc%2Fmain%2Fresources%2Fetc%2Fcustom.properties;h=3eddcf38b33e9e69baa7eeb7fd82362304bf5e39;hp=71b975d8a6ca93b0418d372f2989b2e126043651;hb=aebe2884329d666f661be53e2de3a57e4fcf61f1;hpb=7ce87dcc581a467e5cb158208ada875681481315

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 71b975d8a6..3eddcf38b3 100644
--- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -13,11 +13,20 @@ org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true
 # Use Equinox as default OSGi Framework Implementation
 karaf.framework=equinox
 
-# Use Linux style path
-netconf.ssh.pk.path = ./configuration/RSA.pk
+# Show a progress bar on startup and start the console when all bundles are up and running.
+# (If you are in a hurry you can still type enter to start the shell faster.)
+karaf.delay.console=true
+
 # Set security provider to BouncyCastle
 org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastleProvider
 
+# We set this to false to disable the Aries BlueprintExtender from doing its orderly container
+# shutdown so we can do it after the CSS has shut down all its modules. Otherwise Aries will
+# shutdown blueprint containers when the karaf framework starts shutdown (ie when bundle 0 is
+# stopped) which can cause failures on CSS module shutdown due to the core blueprint containers
+# and services already being shut down. This setting can be removed when/if CSS is removed
+# completely from ODL.
+org.apache.aries.blueprint.preemptiveShutdown=false
 
 netconf.config.persister.active=1
 
@@ -34,36 +43,6 @@ container.profile = Container
 # Connection manager configuration
 connection.scheme = ANY_CONTROLLER_ONE_MASTER
 
-# Open Flow related system parameters
-# TCP port on which the controller is listening (default 6633)
-# of.listenPort=6633
-# IP address of the controller (default: wild card)
-# of.address = 127.0.0.1
-# The time (in milliseconds) the controller will wait for a response after sending a Barrier Request or a Statistic Request message (default 2000 msec)
-# of.messageResponseTimer=2000
-# The switch liveness timeout value (default 60500 msec)
-# of.switchLivenessTimeout=60500
-# The size of the queue holding pending statistics requests (default 64). For large networks of n switches, it is recommended to set the queue size to n
-# of.statsQueueSize = 64
-# The flow statistics polling interval in second (default 10 sec)
-# of.flowStatsPollInterval=10
-# The port statistics polling interval in second (default 5 sec)
-# of.portStatsPollInterval=5
-# The description statistics polling interval in second (default 60 sec)
-# of.descStatsPollInterval=60
-# The table statistics polling interval in second (default 10 sec)
-# of.tableStatsPollInterval=10
-# The maximum number of asynchronous messages can be sent before sending a Barrier Request (default 100)
-# of.barrierMessagePriorCount=100
-# The interval which determines how often the discovery packets should be sent (default 300 sec)
-# of.discoveryInterval=300
-# The timeout multiple of discovery interval
-# of.discoveryTimeoutMultiple=2
-# For newly added ports, allow one more retry if the elapsed time exceeds this threshold (default 30 sec)
-# of.discoveryThreshold=30
-# 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