You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/12/11 18:51:56 UTC

git commit: AMBARI-4042. Fix configs dirs bug (Arsen Babych via dlysnichenko)

Updated Branches:
  refs/heads/trunk d8a915a97 -> 740df281c


AMBARI-4042. Fix configs dirs bug (Arsen Babych via dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/740df281
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/740df281
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/740df281

Branch: refs/heads/trunk
Commit: 740df281c709b2c7bb86c72d3af710c02660dbfe
Parents: d8a915a
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 11 19:51:22 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 11 19:51:22 2013 +0200

----------------------------------------------------------------------
 .../stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py   | 2 +-
 .../HDP/2.0._/services/HBASE/package/scripts/hbase_client.py      | 3 +--
 .../stacks/HDP/2.0._/services/HIVE/package/scripts/params.py      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/740df281/ambari-server/src/main/resources/stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py
index 96ef072..99245e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/GANGLIA/package/scripts/params.py
@@ -22,7 +22,7 @@ from resource_management.core.system import System
 config = Script.get_config()
 
 user_group = config['configurations']['global']["user_group"]
-ganglia_conf_dir = config['configurations']['global']["ganglia_conf_dir"]
+ganglia_conf_dir = "/etc/ganglia/hdp"
 ganglia_dir = "/etc/ganglia"
 ganglia_runtime_dir = config['configurations']['global']["ganglia_runtime_dir"]
 ganglia_shell_cmds_dir = "/usr/libexec/hdp/ganglia"

http://git-wip-us.apache.org/repos/asf/ambari/blob/740df281/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_client.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_client.py
index 2575245..fa6da69 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_client.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HBASE/package/scripts/hbase_client.py
@@ -48,5 +48,4 @@ def main():
   HbaseClient().execute()
   
 if __name__ == "__main__":
-  #HbaseClient().execute()
-  main()
+  HbaseClient().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/740df281/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HIVE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HIVE/package/scripts/params.py
index 4539bd3..9cf50ad 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HIVE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/HIVE/package/scripts/params.py
@@ -61,7 +61,7 @@ kinit_path_local = get_kinit_path([default("kinit_path_local",None), "/usr/bin",
 hive_metatore_keytab_path = default("hive-site/hive.metastore.kerberos.keytab.file","/etc/security/keytabs/hive.service.keytab")
 
 #hive_env
-hive_conf_dir = config['configurations']['global']['hive_conf_dir']
+hive_conf_dir = "/etc/hive/conf"
 hive_dbroot = config['configurations']['global']['hive_dbroot']
 hive_log_dir = config['configurations']['global']['hive_log_dir']
 hive_pid_dir = config['configurations']['global']['hive_pid_dir']