You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/11/26 11:53:43 UTC
ambari git commit: AMBARI-8282 - Set property for windows
stack (Eugene Chekanskiy via abaranchuk)
Repository: ambari
Updated Branches:
refs/heads/trunk cab42f233 -> a5acc8e57
AMBARI-8282 - Set <final> property for windows stack (Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a5acc8e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a5acc8e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a5acc8e5
Branch: refs/heads/trunk
Commit: a5acc8e57b886a175f1e993f0b32ec75a3c86796
Parents: cab42f2
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Wed Nov 26 12:53:25 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Wed Nov 26 12:53:25 2014 +0200
----------------------------------------------------------------------
.../stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py | 3 ++-
.../stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py | 3 ++-
.../stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py | 6 ++++--
.../stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py | 3 ++-
.../stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py | 3 ++-
.../stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py | 3 ++-
.../stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py | 3 ++-
7 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py
index 6b3ca8f..2c0adc4 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/hooks/after-INSTALL/scripts/hook.py
@@ -35,7 +35,8 @@ class AfterInstallHook(Hook):
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['core-site'],
owner=params.hdfs_user,
- mode="f"
+ mode="f",
+ configuration_attributes=params.config['configuration_attributes']['core-site']
)
download_file(os.path.join(params.config['hostLevelParams']['jdk_location'], "sqljdbc4.jar"),
os.path.join(params.hadoop_common_dir, "sqljdbc4.jar")
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py
index a427fb3..b0a52bb 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/package/scripts/hbase.py
@@ -25,5 +25,6 @@ def hbase():
import params
XmlConfig("hbase-site.xml",
conf_dir = params.hbase_conf_dir,
- configurations = params.config['configurations']['hbase-site']
+ configurations = params.config['configurations']['hbase-site'],
+ configuration_attributes=params.config['configuration_attributes']['hbase-site']
)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
index a37ea24..790c8ea 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
@@ -39,14 +39,16 @@ def hdfs(component=None):
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['hadoop-policy'],
owner=params.hdfs_user,
- mode="f"
+ mode="f",
+ configuration_attributes=params.config['configuration_attributes']['hadoop-policy']
)
XmlConfig("hdfs-site.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
owner=params.hdfs_user,
- mode="f"
+ mode="f",
+ configuration_attributes=params.config['configuration_attributes']['hdfs-site']
)
File(format("{params.hadoop_conf_dir}/hadoop-metrics2.properties"),
content=Template("hadoop-metrics2.properties.j2"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py
index f5548e0..54b7911 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HIVE/package/scripts/hive.py
@@ -27,7 +27,8 @@ def hive(name=None):
XmlConfig("hive-site.xml",
conf_dir = params.hive_conf_dir,
configurations = params.config['configurations']['hive-site'],
- owner=params.hive_user
+ owner=params.hive_user,
+ configuration_attributes=params.config['configuration_attributes']['hive-site']
)
if name in ["hiveserver2","metastore"]:
Execute(format("cmd /c hadoop fs -mkdir -p {hive_warehouse_dir}"), logoutput=True, user=params.hadoop_user)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py
index 7778a75..e2056c4 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/package/scripts/oozie.py
@@ -27,7 +27,8 @@ def oozie():
conf_dir = params.oozie_conf_dir,
configurations = params.config['configurations']['oozie-site'],
owner = params.oozie_user,
- mode = 'f'
+ mode = 'f',
+ configuration_attributes=params.config['configuration_attributes']['oozie-site']
)
File(format("{oozie_conf_dir}/oozie-env.cmd"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py
index 38cdb62..d9f5a38 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/package/scripts/tez.py
@@ -26,5 +26,6 @@ def tez():
conf_dir=params.tez_conf_dir,
configurations=params.config['configurations']['tez-site'],
owner=params.tez_user,
- mode="f"
+ mode="f",
+ configuration_attributes=params.config['configuration_attributes']['tez-site']
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5acc8e5/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py
index 8578d74..2783c13 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/package/scripts/yarn.py
@@ -34,7 +34,8 @@ def yarn():
conf_dir=params.config_dir,
configurations=params.config['configurations']['yarn-site'],
owner=params.yarn_user,
- mode='f'
+ mode='f',
+ configuration_attributes=params.config['configuration_attributes']['yarn-site']
)
XmlConfig("capacity-scheduler.xml",
conf_dir=params.config_dir,