You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/01/29 19:13:45 UTC
git commit: AMBARI-4458 Storm: Activate by default. (Denys Buzhor via
atkach)
Updated Branches:
refs/heads/trunk e77d28fca -> 18b0b8bfa
AMBARI-4458 Storm: Activate by default. (Denys Buzhor via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18b0b8bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18b0b8bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18b0b8bf
Branch: refs/heads/trunk
Commit: 18b0b8bfa4f5c1d7eb0a7af2b7b75da8dacac3c7
Parents: e77d28f
Author: atkach <at...@hortonworks.com>
Authored: Wed Jan 29 20:13:38 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Wed Jan 29 20:13:38 2014 +0200
----------------------------------------------------------------------
.../app/assets/data/hosts/HDP2/hosts.json | 24 ++++++++++++++++++++
.../app/assets/data/hosts/HDP2/hosts_init.json | 24 ++++++++++++++++++++
ambari-web/app/config.js | 1 -
ambari-web/app/controllers/wizard.js | 1 -
ambari-web/app/data/services.js | 6 ++---
ambari-web/app/models/quick_links.js | 1 -
ambari-web/app/models/service_config.js | 5 ----
7 files changed, 51 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/assets/data/hosts/HDP2/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hosts.json b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
index 3cd7a6a..d80919a 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
@@ -301,6 +301,30 @@
}
},
{
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/LOGVIEWER_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "LOGVIEWER_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/STORM_UI_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "STORM_UI_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/DRPC_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "DRPC_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
"href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/SUPERVISOR",
"HostRoles" : {
"cluster_name" : "c1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json b/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
index bf3d10f..3ac66c4 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
@@ -330,6 +330,30 @@
}
},
{
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/LOGVIEWER_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "LOGVIEWER_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/STORM_UI_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "STORM_UI_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
+ "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/DRPC_SERVER",
+ "HostRoles" : {
+ "cluster_name" : "c1",
+ "component_name" : "DRPC_SERVER",
+ "host_name" : "dev01.hortonworks.com"
+ }
+ },
+ {
"href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/SUPERVISOR",
"HostRoles" : {
"cluster_name" : "c1",
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index f401e8d..2b11095 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -69,7 +69,6 @@ App.supports = {
deleteHost: true,
autoRollbackHA: false,
appTimelineServer: false,
- storm: false,
jobs: false
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index c290a23..fce3bbf 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -478,7 +478,6 @@ App.WizardController = Em.Controller.extend({
for (var i = 0; i < displayOrderConfig.length; i++) {
var entry = jsonData.items.findProperty("StackServices.service_name", displayOrderConfig[i].serviceName);
if (entry) {
- if (entry.StackServices.service_name == 'STORM' && !App.supports.storm) continue; // @todo remove this line after STORM integration
var myService = Service.create({
serviceName: entry.StackServices.service_name,
displayName: displayOrderConfig[i].displayName,
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/data/services.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/services.js b/ambari-web/app/data/services.js
index ca696a7..b6622a3 100644
--- a/ambari-web/app/data/services.js
+++ b/ambari-web/app/data/services.js
@@ -169,9 +169,9 @@ module.exports = [
serviceName: 'STORM',
displayName: 'Storm',
isDisabled: false,
- isSelected: App.supports.storm,
- canBeSelected: App.supports.storm,
- isHidden: !App.supports.storm,
+ isSelected: true,
+ canBeSelected: true,
+ isHidden: false,
description: Em.I18n.t('services.storm.description')
}
];
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/models/quick_links.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js
index 240cd2f..0118b35 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -389,7 +389,6 @@ App.QuickLinks.FIXTURES = [
regex: portRegex,
default_http_port: 19888
},
- /* @todo Add real info about links */
{
id:31,
label:'Nimbus UI',
http://git-wip-us.apache.org/repos/asf/ambari/blob/18b0b8bf/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index b4c5026..6d1c145 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -401,23 +401,18 @@ App.ServiceConfigProperty = Ember.Object.extend({
this.set('value', masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'));
break;
case 'nimbus.host':
- if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName);
break;
case 'logviewerserver_host':
- if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', masterComponentHostsInDB.findProperty('component', 'LOGVIEWER_SERVER').hostName);
break;
case 'drpcserver_host':
- if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', masterComponentHostsInDB.findProperty('component', 'DRPC_SERVER').hostName);
break;
case 'stormuiserver_host':
- if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', masterComponentHostsInDB.findProperty('component', 'STORM_UI_SERVER').hostName);
break;
case 'supervisor_hosts':
- if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'SUPERVISOR').hosts.mapProperty('hostName'));
break;
case 'hbase.zookeeper.quorum':