Updated Branches: refs/heads/trunk 54549b2d7 -> 0872ee698
AMBARI-4216. Fix deploy fails for nodes without clients (Arsen Babych via aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0872ee69 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0872ee69 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0872ee69 Branch: refs/heads/trunk Commit: 0872ee698b54afee174465a0bf03bb35157396e4 Parents: 54549b2 Author: Andrew Onischuk <[email protected]> Authored: Fri Jan 3 01:36:08 2014 -0800 Committer: Andrew Onischuk <[email protected]> Committed: Fri Jan 3 01:36:08 2014 -0800 ---------------------------------------------------------------------- .../HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py | 1 + .../before-INSTALL/scripts/shared_initialization.py | 5 +++++ .../stacks/HDP/1.3.4/services/HDFS/metainfo.xml | 12 ------------ .../HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py | 1 + .../before-INSTALL/scripts/shared_initialization.py | 5 +++++ .../stacks/HDP/2.0.8/services/HDFS/metainfo.xml | 12 ------------ 6 files changed, 12 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py index 0708c15..51e5cd2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/hook.py @@ -30,6 +30,7 @@ class BeforeConfigureHook(Hook): env.set_params(params) setup_users() + install_packages() if __name__ == "__main__": BeforeConfigureHook().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/shared_initialization.py index a127678..26a7592 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/hooks/before-INSTALL/scripts/shared_initialization.py @@ -100,3 +100,8 @@ def set_uid(user, user_dirs): mode=0555) Execute(format("/tmp/changeUid.sh {user} {user_dirs} 2>/dev/null"), not_if = format("test $(id -u {user}) -gt 1000")) + +def install_packages(): + Package("unzip") + Package("net-snmp") + Package("net-snmp-utils") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml index e89bd56..cd6f3a5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HDFS/metainfo.xml @@ -70,22 +70,10 @@ <packages> <package> <type>rpm</type> - <name>net-snmp</name> - </package> - <package> - <type>rpm</type> - <name>net-snmp-utils</name> - </package> - <package> - <type>rpm</type> <name>lzo</name> </package> <package> <type>rpm</type> - <name>unzip</name> - </package> - <package> - <type>rpm</type> <name>hadoop</name> </package> <package> http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py index 0708c15..51e5cd2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/hook.py @@ -30,6 +30,7 @@ class BeforeConfigureHook(Hook): env.set_params(params) setup_users() + install_packages() if __name__ == "__main__": BeforeConfigureHook().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/shared_initialization.py index a127678..26a7592 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/hooks/before-INSTALL/scripts/shared_initialization.py @@ -100,3 +100,8 @@ def set_uid(user, user_dirs): mode=0555) Execute(format("/tmp/changeUid.sh {user} {user_dirs} 2>/dev/null"), not_if = format("test $(id -u {user}) -gt 1000")) + +def install_packages(): + Package("unzip") + Package("net-snmp") + Package("net-snmp-utils") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/0872ee69/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml index c7d6dea..6cb2dfa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HDFS/metainfo.xml @@ -91,22 +91,10 @@ <packages> <package> <type>rpm</type> - <name>net-snmp</name> - </package> - <package> - <type>rpm</type> - <name>net-snmp-utils</name> - </package> - <package> - <type>rpm</type> <name>lzo</name> </package> <package> <type>rpm</type> - <name>unzip</name> - </package> - <package> - <type>rpm</type> <name>hadoop</name> </package> <package>
