You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/03/02 10:21:06 UTC
ambari git commit: AMBARI-9840: Warning Alert for storm after
enabling security (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 8371a8a0e -> 3b6d56da8
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/3b6d56da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b6d56da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b6d56da
Branch: refs/heads/trunk
Commit: 3b6d56da8eba849b5dd3612355eff084de33d065
Parents: 8371a8a
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Mon Mar 2 01:20:58 2015 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Mon Mar 2 01:20:58 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/3b6d56da/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/3b6d56da/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/3b6d56da/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")