Reduce custom.properties

We have quite a few legacy properties defined from Hydrogen/AD-SAL days.
Clean them up.

JIRA: ODLPARENT-34
Change-Id: I4370a89b2f94894115844148ac66caa395959b3a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 cb68393a67832372b573f4284abd7f0b58204463..16716070dab28c5a69454ef8ee9b1cf90a1ea638 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -23,37 +23,12 @@ org.apache.karaf.security.providers = org.bouncycastle.jce.provider.BouncyCastle
 # Container configuration
 container.profile = Container
 
-# Connection manager configuration
-connection.scheme = ANY_CONTROLLER_ONE_MASTER
-
-# 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
-# entries, including switches' Certification Authority (CA) certificates. For example,
-# secureChannelEnabled=true
-# controllerKeyStore=./configuration/ctlKeyStore
-# controllerKeyStorePassword=xxxxxxxx (this password should match the password used for KeyStore generation and at least 6 characters)
-# controllerTrustStore=./configuration/ctlTrustStore
-# controllerTrustStorePassword=xxxxxxxx (this password should match the password used for TrustStore generation and at least 6 characters)
-
-secureChannelEnabled=false
-controllerKeyStore=
-controllerKeyStorePassword=
-controllerTrustStore=
-controllerTrustStorePassword=
-
-# User Manager configurations
-enableStrongPasswordCheck = false
-
 #Jolokia configurations
 #org.jolokia.listenForHttpService=false
 
 # Logging configuration for Tomcat-JUL logging
 java.util.logging.config.file=configuration/tomcat-logging.properties
 
-#Hosttracker hostsdb key scheme setting
-hosttracker.keyscheme=IP
-
 # LISP Flow Mapping configuration
 # Enable merging RLOC sets received from different xTR-IDs for the same EID (default: false)
 lisp.mappingMerge = false