Repository: ambari Updated Branches: refs/heads/trunk aa2930a4a -> c2788a4bd
AMBARI-18087. Fix conf-select for Zeppelin service (Renjith Kamath via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2788a4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2788a4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2788a4b Branch: refs/heads/trunk Commit: c2788a4bd0b075a3b9419ab5d44fdc6bd1ee5b9e Parents: aa2930a Author: Sumit Mohanty <[email protected]> Authored: Tue Aug 9 12:00:28 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Tue Aug 9 12:00:53 2016 -0700 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/HostInfo.py | 4 ++-- .../resource_management/libraries/functions/conf_select.py | 6 ++++++ .../ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c2788a4b/ambari-agent/src/main/python/ambari_agent/HostInfo.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py index 9eb36d8..3871e72 100644 --- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/c2788a4b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py index 109d71a..b7e873f 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/c2788a4b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 133b59c..8eb36c8 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/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)
