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 2014/02/05 13:36:18 UTC
git commit: AMBARI-4531. Failures on Suse install for Baikal
(aonishuk)
Updated Branches:
refs/heads/trunk 1dbea4476 -> 5bf15d0ab
AMBARI-4531. Failures on Suse install for Baikal (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5bf15d0a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5bf15d0a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5bf15d0a
Branch: refs/heads/trunk
Commit: 5bf15d0ab6d8d9f3c2b0f3fa785028592424e50e
Parents: 1dbea44
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Wed Feb 5 04:35:23 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Wed Feb 5 04:36:00 2014 -0800
----------------------------------------------------------------------
.../1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py | 4 +++-
.../2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py | 4 +++-
.../stacks/1.3.2/hooks/before-INSTALL/test_before_install.py | 1 -
.../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 1 -
4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bf15d0a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
index 26a7592..4e51c17 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -104,4 +104,6 @@ def set_uid(user, user_dirs):
def install_packages():
Package("unzip")
Package("net-snmp")
- Package("net-snmp-utils")
\ No newline at end of file
+
+ if System.get_instance().os_family != "suse":
+ Package("net-snmp-utils")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bf15d0a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index c5688b0..c238471 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -114,4 +114,6 @@ def set_uid(user, user_dirs):
def install_packages():
Package("unzip")
Package("net-snmp")
- Package("net-snmp-utils")
+
+ if System.get_instance().os_family != "suse":
+ Package("net-snmp-utils")
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bf15d0a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
index a0850a2..3867f48 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
@@ -74,5 +74,4 @@ class TestHookBeforeInstall(RMFTestCase):
gid='hadoop',)
self.assertResourceCalled('Package', 'unzip',)
self.assertResourceCalled('Package', 'net-snmp',)
- self.assertResourceCalled('Package', 'net-snmp-utils',)
self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/5bf15d0a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index 213da63..76136e8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -86,5 +86,4 @@ class TestHookBeforeInstall(RMFTestCase):
groups=['hadoop'], )
self.assertResourceCalled('Package', 'unzip', )
self.assertResourceCalled('Package', 'net-snmp', )
- self.assertResourceCalled('Package', 'net-snmp-utils', )
self.assertNoMoreResources()