浏览代码

HUE-8539 [importer] Clean-up configuration and turn sqoop and solr imports to on by default

Romain Rigaux 7 年之前
父节点
当前提交
598a47d
共有 3 个文件被更改,包括 8 次插入27 次删除
  1. 3 9
      desktop/conf.dist/hue.ini
  2. 3 9
      desktop/conf/pseudo-distributed.ini.tmpl
  3. 2 9
      desktop/libs/indexer/src/indexer/conf.py

+ 3 - 9
desktop/conf.dist/hue.ini

@@ -1372,25 +1372,19 @@
 
 
 ###########################################################################
-# Settings to configure Solr Indexer
+# Settings to configure the Data Import Wizard
 ###########################################################################
 
 [indexer]
 
-  # Location of the solrctl binary.
-  ## solrctl_path=/usr/bin/solrctl
-
   # Flag to turn on the Morphline Solr indexer.
-  ## enable_scalable_indexer=false
+  ## enable_scalable_indexer=true
 
   # Oozie workspace template for indexing.
   ## config_indexer_libs_path=/tmp/smart_indexer_lib
 
-  # Flag to turn on the new metadata importer.
-  ## enable_new_importer=false
-
   # Flag to turn on Sqoop ingest.
-  ## enable_sqoop=false
+  ## enable_sqoop=true
 
   # Flag to turn on Kafka topic ingest.
   ## enable_kafka=false

+ 3 - 9
desktop/conf/pseudo-distributed.ini.tmpl

@@ -1374,25 +1374,19 @@
 
 
 ###########################################################################
-# Settings to configure Solr Indexer
+# Settings to configure the Data Importer Wizard
 ###########################################################################
 
 [indexer]
 
-  # Location of the solrctl binary.
-  ## solrctl_path=/usr/bin/solrctl
-
   # Flag to turn on the Morphline Solr indexer.
-  ## enable_scalable_indexer=false
+  ## enable_scalable_indexer=true
 
   # Oozie workspace template for indexing.
   ## config_indexer_libs_path=/tmp/smart_indexer_lib
 
-  # Flag to turn on the new metadata importer.
-  ## enable_new_importer=false
-
   # Flag to turn on Sqoop ingest.
-  ## enable_sqoop=false
+  ## enable_sqoop=true
 
   # Flag to turn on Kafka topic ingest.
   ## enable_kafka=false

+ 2 - 9
desktop/libs/indexer/src/indexer/conf.py

@@ -67,13 +67,6 @@ def zkensemble():
     LOG.warn('Failed to get Solr url')
 
 
-ENABLE_NEW_IMPORTER = Config(
-  key="enable_new_importer",
-  help=_t("Flag to turn on the new metadata importer."),
-  type=bool,
-  default=False
-)
-
 # Deprecated as always on
 ENABLE_NEW_INDEXER = Config(
   key="enable_new_indexer",
@@ -86,7 +79,7 @@ ENABLE_SCALABLE_INDEXER = Config(
   key="enable_scalable_indexer",
   help=_t("Flag to turn on the Morphline Solr indexer."),
   type=bool,
-  default=False
+  default=True
 )
 
 CONFIG_INDEXER_LIBS_PATH = Config(
@@ -100,7 +93,7 @@ ENABLE_SQOOP = Config(
   key="enable_sqoop",
   help=_t("Flag to turn on Sqoop imports."),
   type=bool,
-  default=False
+  default=True
 )
 
 ENABLE_KAFKA = Config(