X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fclustering%2Fservices_implementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fservices_implementation%2Finternal%2FClusterManager.java;h=ca13fbc2d23df7cb94d295401e48c30ec78bb9aa;hp=cd3a29579194c9a6a9831f4e44d7e67150b69f6d;hb=3f9e049ba12a0048fe2ee98c21ab615867df7b21;hpb=16e527c3b82c24e646355f55910179f9c5138b08

diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
index cd3a295791..ca13fbc2d2 100644
--- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
+++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java
@@ -252,7 +252,10 @@ public class ClusterManager implements IClusterServices, IContainerAware {
         try {
             ParserRegistry parser = new ParserRegistry(this.getClass()
                     .getClassLoader());
-            ConfigurationBuilderHolder holder = parser.parseFile("config/infinispan-config.xml");
+            String infinispanConfigFile =
+                    System.getProperty("org.infinispan.config.file", "config/infinispan-config.xml");
+            logger.debug("Using configuration file:{}", infinispanConfigFile);
+            ConfigurationBuilderHolder holder = parser.parseFile(infinispanConfigFile);
             GlobalConfigurationBuilder globalBuilder = holder.getGlobalConfigurationBuilder();
             globalBuilder.serialization()
                     .classResolver(new ClassResolver())