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 2015/06/12 16:25:22 UTC
[1/2] ambari git commit: AMBARI-11885. Storm supervisors deployed by
Ambari use storm-client link (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e2b4d2bcc -> c5e76ebc3
refs/heads/trunk 3f673d343 -> 4a946466e
AMBARI-11885. Storm supervisors deployed by Ambari use storm-client link (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a946466
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a946466
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a946466
Branch: refs/heads/trunk
Commit: 4a946466e1ddb9feee324bbcf8d80dab0f50964a
Parents: 3f673d3
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jun 12 17:25:02 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jun 12 17:25:02 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4a946466/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index 68f2d0e..0df0100 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -69,9 +69,9 @@ storm_lib_dir = "/usr/lib/storm/lib/"
# hadoop parameters for 2.2+
if stack_is_hdp22_or_further:
- rest_lib_dir = '/usr/hdp/current/storm-client/contrib/storm-rest'
- storm_bin_dir = "/usr/hdp/current/storm-client/bin"
- storm_lib_dir = "/usr/hdp/current/storm-client/lib"
+ rest_lib_dir = format("{storm_component_home_dir}/contrib/storm-rest")
+ storm_bin_dir = format("{storm_component_home_dir}/bin")
+ storm_lib_dir = format("{storm_component_home_dir}/lib")
storm_user = config['configurations']['storm-env']['storm_user']
[2/2] ambari git commit: AMBARI-11885. Storm supervisors deployed by
Ambari use storm-client link (aonishuk)
Posted by ao...@apache.org.
AMBARI-11885. Storm supervisors deployed by Ambari use storm-client link (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5e76ebc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5e76ebc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5e76ebc
Branch: refs/heads/branch-2.1
Commit: c5e76ebc312e5b572da1613a21ae9484f6b026aa
Parents: e2b4d2b
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jun 12 17:25:04 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jun 12 17:25:04 2015 +0300
----------------------------------------------------------------------
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c5e76ebc/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index 68f2d0e..0df0100 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -69,9 +69,9 @@ storm_lib_dir = "/usr/lib/storm/lib/"
# hadoop parameters for 2.2+
if stack_is_hdp22_or_further:
- rest_lib_dir = '/usr/hdp/current/storm-client/contrib/storm-rest'
- storm_bin_dir = "/usr/hdp/current/storm-client/bin"
- storm_lib_dir = "/usr/hdp/current/storm-client/lib"
+ rest_lib_dir = format("{storm_component_home_dir}/contrib/storm-rest")
+ storm_bin_dir = format("{storm_component_home_dir}/bin")
+ storm_lib_dir = format("{storm_component_home_dir}/lib")
storm_user = config['configurations']['storm-env']['storm_user']