ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-9840: Warning Alert for storm after enabling security (jluniya)
Date Mon, 02 Mar 2015 09:22:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 334110ae1 -> 0b507e8e4


AMBARI-9840: Warning Alert for storm after enabling security (jluniya)


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

Branch: refs/heads/branch-2.0.0
Commit: 0b507e8e43effc609307190875c99a58afb637dc
Parents: 334110a
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Mon Mar 2 01:20:58 2015 -0800
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Mon Mar 2 01:21:43 2015 -0800

----------------------------------------------------------------------
 .../resources/common-services/FALCON/0.5.0.2.1/alerts.json  | 4 ++--
 .../resources/common-services/STORM/0.9.1.2.1/alerts.json   | 4 ++--
 .../src/test/python/custom_actions/TestCheckHost.py         | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b507e8e/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/alerts.json
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/alerts.json
index a85787e..7001122 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/alerts.json
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/alerts.json
@@ -39,8 +39,8 @@
           "uri": {
             "http": "{{falcon-env/falcon_port}}",
             "default_port": 15000,
-            "kerberos_keytab": "{{core-site/hadoop.http.authentication.kerberos.keytab}}",
-            "kerberos_principal": "{{core-site/hadoop.http.authentication.kerberos.principal}}"
+            "kerberos_keytab": "{{falcon-startup.properties/*.falcon.http.authentication.kerberos.keytab}}",
+            "kerberos_principal": "{{falcon-startup.properties/*.falcon.http.authentication.kerberos.principal}}"
           },
           "reporting": {
             "ok": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b507e8e/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json
index abf6b81..8084e1f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/alerts.json
@@ -62,8 +62,8 @@
           "type": "WEB",
           "uri": {
             "http": "{{storm-site/ui.port}}",
-            "kerberos_keytab": "{{core-site/hadoop.http.authentication.kerberos.keytab}}",
-            "kerberos_principal": "{{core-site/hadoop.http.authentication.kerberos.principal}}"
+           "kerberos_keytab": "{{storm-env/storm_ui_keytab}}",
+            "kerberos_principal": "{{storm-env/storm_ui_principal_name}}"
           },
           "reporting": {
             "ok": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b507e8e/ambari-server/src/test/python/custom_actions/TestCheckHost.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/TestCheckHost.py b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
index 2cd5c7a..101eac9 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -40,7 +40,7 @@ else:
 
 
 class TestCheckHost(TestCase):
-
+  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
   @patch("os.path.isfile")
   @patch.object(Script, 'get_config')
   @patch.object(Script, 'get_tmp_dir')
@@ -69,7 +69,7 @@ class TestCheckHost(TestCase):
     self.assertEquals(structured_out_mock.call_args[0][0], {'java_home_check': {"message":
"Java home doesn't exist!",
                                                                                 "exit_code"
: 1}})
 
-
+  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
   @patch.object(Script, 'get_config')
   @patch.object(Script, 'get_tmp_dir')
   @patch("check_host.download_file")
@@ -179,7 +179,7 @@ class TestCheckHost(TestCase):
             'available on host. Please install it. Java home should be the same as on server.
\n', 'exit_code': 1}})
 
 
-
+  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
   @patch("socket.gethostbyname")
   @patch.object(Script, 'get_config')
   @patch.object(Script, 'get_tmp_dir')
@@ -219,7 +219,8 @@ class TestCheckHost(TestCase):
                     {'cause': (), 'host': u'!!!', 'type': 'FORWARD_LOOKUP'}], 
        'message': 'There were 5 host(s) that could not resolve to an IP address.', 
        'failed_count': 5, 'success_count': 0, 'exit_code': 0}})
-    
+
+  @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = os_distro_value))
   @patch.object(Script, 'get_config')
   @patch.object(Script, 'get_tmp_dir')
   @patch("resource_management.libraries.script.Script.put_structured_out")


Mime
View raw message