You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/11/14 02:01:10 UTC
ambari git commit: AMBARI-8322. Nimbus fails to start in the secure
cluster. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 db0f039a0 -> 56184b436
AMBARI-8322. Nimbus fails to start in the secure cluster. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56184b43
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56184b43
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56184b43
Branch: refs/heads/branch-1.7.0
Commit: 56184b436bb53cc3f4001af4a646c0caa41344cf
Parents: db0f039
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Nov 13 17:00:28 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Nov 13 17:01:02 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.1/services/STORM/package/scripts/params.py | 4 ++--
.../src/test/python/stacks/2.1/configs/secured-storm-start.json | 4 ++--
ambari-web/app/controllers/main/admin/security/add/step3.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/56184b43/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
index 5a84c05..4803050 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
@@ -70,8 +70,8 @@ if security_enabled:
storm_keytab_path = config['configurations']['storm-env']['storm_keytab']
if stack_is_hdp22_or_further:
- storm_ui_keytab_path = config['configurations']['storm-env']['strom_ui_keytab']
- _storm_ui_jaas_principal_name = config['configurations']['storm-env']['strom_ui_principal_name']
+ storm_ui_keytab_path = config['configurations']['storm-env']['storm_ui_keytab']
+ _storm_ui_jaas_principal_name = config['configurations']['storm-env']['storm_ui_principal_name']
storm_ui_host = default("/clusterHostInfo/storm_ui_server_hosts", [])
storm_ui_jaas_principal = _storm_ui_jaas_principal_name.replace('_HOST',storm_ui_host[0].lower())
http://git-wip-us.apache.org/repos/asf/ambari/blob/56184b43/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
index 4740f80..29b9c83 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
@@ -219,10 +219,10 @@
"storm_user": "storm",
"content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}\n\n# export STORM_CONF_DIR=\"\"",
"nimbus_principal_name": "nimbus/_HOST@EXAMPLE.COM",
- "strom_ui_keytab": "/etc/security/keytabs/http.storm.service.keytab",
+ "storm_ui_keytab": "/etc/security/keytabs/http.storm.service.keytab",
"nimbus_keytab": "/etc/security/keytabs/nimbus.service.keytab",
"storm_keytab": "/etc/security/keytabs/storm.service.keytab",
- "strom_ui_principal_name": "HTTP/_HOST"
+ "storm_ui_principal_name": "HTTP/_HOST"
},
"core-site": {
"io.serializations": "org.apache.hadoop.io.serializer.WritableSerialization",
http://git-wip-us.apache.org/repos/asf/ambari/blob/56184b43/ambari-web/app/controllers/main/admin/security/add/step3.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/add/step3.js b/ambari-web/app/controllers/main/admin/security/add/step3.js
index c94f42f..a450399 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -355,7 +355,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
setHostComponentsSecureValue: function (result, host, addedPrincipalsHost, securityUsers, hadoopGroupId) {
var componentsToDisplay = ['NAMENODE', 'SECONDARY_NAMENODE', 'DATANODE', 'JOBTRACKER', 'ZOOKEEPER_SERVER', 'HIVE_SERVER', 'TASKTRACKER',
'OOZIE_SERVER', 'NAGIOS_SERVER', 'HBASE_MASTER', 'HBASE_REGIONSERVER', 'HISTORYSERVER', 'RESOURCEMANAGER', 'NODEMANAGER', 'JOURNALNODE',
- 'SUPERVISOR', 'NIMBUS', 'FALCON_SERVER', 'KNOX_GATEWAY', 'APP_TIMELINE_SERVER'];
+ 'SUPERVISOR', 'NIMBUS', 'STORM_UI_SERVER','FALCON_SERVER', 'KNOX_GATEWAY', 'APP_TIMELINE_SERVER'];
if (App.get('isHadoop22Stack')) {
componentsToDisplay.push('DRPC_SERVER');
}