You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/09/12 09:49:43 UTC
[1/2] ambari git commit: AMBARI-18356. ZEPPELIN user won't get
created in ZEPPELIN group (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 7ef4fe57f -> 6d634522f
refs/heads/trunk 4b141dd88 -> e9b4f5298
AMBARI-18356. ZEPPELIN user won't get created in ZEPPELIN group (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e9b4f529
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e9b4f529
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e9b4f529
Branch: refs/heads/trunk
Commit: e9b4f5298123d98a062f458604a2ae322405a282
Parents: 4b141dd
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Sep 12 12:49:21 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Sep 12 12:49:21 2016 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e9b4f529/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 5544085..8b52ca1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -169,6 +169,8 @@ tez_user = config['configurations']['tez-env']["tez_user"]
oozie_user = config['configurations']['oozie-env']["oozie_user"]
falcon_user = config['configurations']['falcon-env']["falcon_user"]
ranger_user = config['configurations']['ranger-env']["ranger_user"]
+zeppelin_user = config['configurations']['zeppelin-env']["zeppelin_user"]
+zeppelin_group = config['configurations']['zeppelin-env']["zeppelin_group"]
user_group = config['configurations']['cluster-env']['user_group']
@@ -178,6 +180,7 @@ hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
oozie_servers = default("/clusterHostInfo/oozie_server", [])
falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
+zeppelin_master_hosts = default("/clusterHostInfo/zeppelin_master_hosts", [])
has_namenode = not len(namenode_host) == 0
has_ganglia_server = not len(ganglia_server_hosts) == 0
@@ -186,6 +189,7 @@ has_hbase_masters = not len(hbase_master_hosts) == 0
has_oozie_server = not len(oozie_servers) == 0
has_falcon_server_hosts = not len(falcon_server_hosts) == 0
has_ranger_admin = not len(ranger_admin_hosts) == 0
+has_zeppelin_master = not len(zeppelin_master_hosts) == 0
if has_namenode or dfs_type == 'HCFS':
hadoop_conf_dir = conf_select.get_hadoop_conf_dir(force_latest_on_upgrade=True)
@@ -219,6 +223,8 @@ if has_falcon_server_hosts:
user_to_groups_dict[falcon_user] = [proxyuser_group]
if has_ranger_admin:
user_to_groups_dict[ranger_user] = [ranger_group]
+if has_zeppelin_master:
+ user_to_groups_dict[zeppelin_user] = [zeppelin_group, user_group]
user_to_gid_dict = collections.defaultdict(lambda:user_group)
[2/2] ambari git commit: AMBARI-18356. ZEPPELIN user won't get
created in ZEPPELIN group (aonishuk)
Posted by ao...@apache.org.
AMBARI-18356. ZEPPELIN user won't get created in ZEPPELIN group (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6d634522
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6d634522
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6d634522
Branch: refs/heads/branch-2.5
Commit: 6d634522ff24851348cd079d1369c0fe5b2174d0
Parents: 7ef4fe5
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Sep 12 12:49:24 2016 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Sep 12 12:49:24 2016 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6d634522/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 5544085..8b52ca1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -169,6 +169,8 @@ tez_user = config['configurations']['tez-env']["tez_user"]
oozie_user = config['configurations']['oozie-env']["oozie_user"]
falcon_user = config['configurations']['falcon-env']["falcon_user"]
ranger_user = config['configurations']['ranger-env']["ranger_user"]
+zeppelin_user = config['configurations']['zeppelin-env']["zeppelin_user"]
+zeppelin_group = config['configurations']['zeppelin-env']["zeppelin_group"]
user_group = config['configurations']['cluster-env']['user_group']
@@ -178,6 +180,7 @@ hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
oozie_servers = default("/clusterHostInfo/oozie_server", [])
falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
+zeppelin_master_hosts = default("/clusterHostInfo/zeppelin_master_hosts", [])
has_namenode = not len(namenode_host) == 0
has_ganglia_server = not len(ganglia_server_hosts) == 0
@@ -186,6 +189,7 @@ has_hbase_masters = not len(hbase_master_hosts) == 0
has_oozie_server = not len(oozie_servers) == 0
has_falcon_server_hosts = not len(falcon_server_hosts) == 0
has_ranger_admin = not len(ranger_admin_hosts) == 0
+has_zeppelin_master = not len(zeppelin_master_hosts) == 0
if has_namenode or dfs_type == 'HCFS':
hadoop_conf_dir = conf_select.get_hadoop_conf_dir(force_latest_on_upgrade=True)
@@ -219,6 +223,8 @@ if has_falcon_server_hosts:
user_to_groups_dict[falcon_user] = [proxyuser_group]
if has_ranger_admin:
user_to_groups_dict[ranger_user] = [ranger_group]
+if has_zeppelin_master:
+ user_to_groups_dict[zeppelin_user] = [zeppelin_group, user_group]
user_to_gid_dict = collections.defaultdict(lambda:user_group)