[atlas] branch master updated: ATLAS-3217: Cannot start Atlas 3.0 SNAPSHOT in embedded-hbase-solr configuration

[sa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sarath pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/master by this push:
     new 51c377d  ATLAS-3217: Cannot start Atlas 3.0 SNAPSHOT in embedded-hbase-solr configuration
51c377d is described below

commit 51c377da6d8d51b7ccfc6f524ebfca1be4c93709
Author: Sridhar K <sk...@cloudera.com>
AuthorDate: Thu May 23 12:06:44 2019 -0700

    ATLAS-3217: Cannot start Atlas 3.0 SNAPSHOT in embedded-hbase-solr configuration
    
    Signed-off-by: Sarath Subramanian <sa...@apache.org>
---
 distro/src/bin/atlas_config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distro/src/bin/atlas_config.py b/distro/src/bin/atlas_config.py
index f09026f..5079d4b 100755
--- a/distro/src/bin/atlas_config.py
+++ b/distro/src/bin/atlas_config.py
@@ -32,7 +32,7 @@ LIB = "lib"
 CONF = "conf"
 LOG = "logs"
 WEBAPP = "server" + os.sep + "webapp"
-CONFIG_SETS_CONF = "server" + os.sep + "solr" + os.sep + "configsets" + os.sep + "_default" + os.sep + "conf"
+SOLR_CONF_DIR = "conf" + os.sep + "solr"
 DATA = "data"
 ATLAS_CONF = "ATLAS_CONF"
 ATLAS_LOG = "ATLAS_LOG_DIR"
@@ -112,7 +112,7 @@ def elasticsearchBinDir(dir):
     return os.environ.get(SOLR_BIN, os.path.join(dir, "elasticsearch", BIN))
 
 def solrConfDir(dir):
-    return os.environ.get(SOLR_CONF, os.path.join(dir, "solr", CONFIG_SETS_CONF))
+    return os.environ.get(SOLR_CONF, os.path.join(dir, SOLR_CONF_DIR))
 
 def solrPort():
     return os.environ.get(SOLR_PORT, DEFAULT_SOLR_PORT)