فهرست منبع

AMBARI-18087. Fix conf-select for Zeppelin service (Renjith Kamath via smohanty)

Sumit Mohanty 9 سال پیش
والد
کامیت
2a55dc08c8

+ 2 - 2
ambari-agent/src/main/python/ambari_agent/HostInfo.py

@@ -133,7 +133,7 @@ class HostInfoLinux(HostInfo):
     "webhcat", "hadoop-hdfs", "hadoop-yarn", "hadoop-mapreduce",
     "knox", "yarn", "hive-webhcat", "kafka", "slider", "storm-slider-client",
     "mahout", "spark", "pig", "phoenix", "ranger", "accumulo",
-    "ambari-metrics-collector", "ambari-metrics-monitor", "atlas"
+    "ambari-metrics-collector", "ambari-metrics-monitor", "atlas", "zeppelin"
   ]
 
 
@@ -146,7 +146,7 @@ class HostInfoLinux(HostInfo):
     "hive", "ambari-qa", "oozie", "hbase", "hcat", "mapred",
     "hdfs", "zookeeper", "flume", "sqoop", "sqoop2",
     "hue", "yarn", "tez", "storm", "falcon", "kafka", "knox", "ams",
-    "hadoop", "spark", "accumulo", "atlas", "mahout", "ranger", "kms"
+    "hadoop", "spark", "accumulo", "atlas", "mahout", "ranger", "kms", "zeppelin"
   ]
   
   # Default set of directories that are checked for existence of files and folders

+ 6 - 0
ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py

@@ -153,6 +153,12 @@ _PACKAGE_DIRS = {
       "current_dir": "{0}/current/spark-client/conf".format(STACK_ROOT_PATTERN)
     }
   ],
+  "zeppelin": [
+    {
+      "conf_dir": "/etc/zeppelin/conf",
+      "current_dir": "{0}/current/zeppelin-server/conf".format(STACK_ROOT_PATTERN)
+    }
+  ],
   "spark2": [
     {
       "conf_dir": "/etc/spark2/conf",

+ 3 - 0
ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py

@@ -159,6 +159,9 @@ class Master(Script):
     import time
     self.configure(env)
 
+    Execute(("chown", "-R", format("{zeppelin_user}") + ":" + format("{zeppelin_group}"), "/etc/zeppelin"),
+            sudo=True)
+
     if params.security_enabled:
         zeppelin_kinit_cmd = format("{kinit_path_local} -kt {zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ")
         Execute(zeppelin_kinit_cmd, user=params.zeppelin_user)