From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 9 Apr 2020 15:24:22 +0000 (+0200)
Subject: Remove remnants of leveldb configuration
X-Git-Tag: v2.0.0~44
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=efd2203ccd8dc0b1aa6c1a723c9f91c26eb27f37

Remove remnants of leveldb configuration

We do not have leveldb available in Aluminium, remove remaining
configuration directives which would reference it.

Change-Id: I586b96b16adda975c2df405cb8154bc568f06d81
JIRA: CONTROLLER-1921
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
index a51e09f0ec..26ebb83594 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
@@ -34,16 +34,6 @@ odl-cluster-data {
       # The relative path is always relative to KARAF_HOME.
 
       # snapshot-store.local.dir = "target/snapshots"
-      # journal.leveldb.dir = "target/journal"
-
-      journal {
-        leveldb {
-          # Set native = off to use a Java-only implementation of leveldb.
-          # Note that the Java-only version is not currently considered by Akka to be production quality.
-
-          # native = off
-        }
-      }
     }
   }
 }
diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
index 464645b6ae..dbb5dc71e7 100644
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
@@ -124,13 +124,6 @@ odl-cluster-data {
 
     persistence {
       journal {
-        # This would activate the deprecated levedb persistence plugin. This plugin was used
-        # by default by all OpenDaylight versions, but is considered not ready for production
-        # use by Akka. Magnesium defaults to segmented-file journal (below) and this option will
-        # be removed in a future release.
-        #
-        # plugin = akka.persistence.journal.leveldb
-
         # The following activates the default segmented file journal. Each persistent actor
         # is stored in a separate directory, with multiple segment files. Segments are removed
         # when they are not longer required.