You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/11 21:02:30 UTC
[10/26] git commit: AMBARI-7224. Step 8 of installer is empty for
2.1.GlusterFS stack, then if click back button and next again,
repositories show but no services. (jaimin)
AMBARI-7224. Step 8 of installer is empty for 2.1.GlusterFS stack, then if click back button and next again, repositories show but no services. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c9bb86c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c9bb86c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c9bb86c
Branch: refs/heads/branch-alerts-dev
Commit: 3c9bb86cbed926e8024ecf992457cf8008369321
Parents: 6722aba
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed Sep 10 11:01:53 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed Sep 10 11:01:53 2014 -0700
----------------------------------------------------------------------
.../stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml | 5 +++++
.../stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml | 1 +
ambari-web/app/controllers/wizard/step5_controller.js | 2 +-
ambari-web/app/controllers/wizard/step6_controller.js | 2 +-
ambari-web/app/controllers/wizard/step8_controller.js | 2 +-
5 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9bb86c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml
index 5145c02..0a6e730 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/metainfo.xml
@@ -28,6 +28,7 @@
<component>
<name>NIMBUS</name>
+ <displayName>Nimbus</displayName>
<category>MASTER</category>
<cardinality>1</cardinality>
<dependencies>
@@ -48,6 +49,7 @@
<component>
<name>STORM_REST_API</name>
+ <displayName>Storm REST API Server</displayName>
<category>MASTER</category>
<cardinality>1</cardinality>
<commandScript>
@@ -59,6 +61,7 @@
<component>
<name>SUPERVISOR</name>
+ <displayName>Supervisor</displayName>
<category>SLAVE</category>
<cardinality>1+</cardinality>
<commandScript>
@@ -70,6 +73,7 @@
<component>
<name>STORM_UI_SERVER</name>
+ <displayName>Storm UI Server</displayName>
<category>MASTER</category>
<cardinality>1</cardinality>
<commandScript>
@@ -81,6 +85,7 @@
<component>
<name>DRPC_SERVER</name>
+ <displayName>DRPC Server</displayName>
<category>MASTER</category>
<cardinality>1</cardinality>
<commandScript>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9bb86c/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
index fbe90fa..50c9818 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml
@@ -27,6 +27,7 @@
<component>
<name>APP_TIMELINE_SERVER</name>
+ <displayName>App Timeline Server</displayName>
<category>MASTER</category>
<cardinality>1</cardinality>
<commandScript>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9bb86c/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js
index fb8ccf7..e08e709 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -623,7 +623,7 @@ App.WizardStep5Controller = Em.Controller.extend(App.BlueprintMixin, {
var componentObj = {};
componentObj.component_name = componentName;
- componentObj.display_name = fullComponent.get('displayName');
+ componentObj.display_name = App.format.role(fullComponent.get('componentName'));
componentObj.serviceId = fullComponent.get('serviceName');
componentObj.isServiceCoHost = App.StackServiceComponent.find().findProperty('componentName', componentName).get('isCoHostedComponent') && !this.get('isReassignWizard');
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9bb86c/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 9fe3659..3bd11c5 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -302,7 +302,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
if (serviceComponent.get('isShownOnInstallerSlaveClientPage')) {
headers.pushObject(Em.Object.create({
name: serviceComponent.get('componentName'),
- label: serviceComponent.get('displayName'),
+ label: App.format.role(serviceComponent.get('componentName')),
allChecked: false,
isRequired: serviceComponent.get('isRequired'),
noChecked: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3c9bb86c/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 04cb728..7b7ae11 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -654,7 +654,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
displayName = Em.I18n.t('common.clients')
} else {
// remove service name from component display name
- displayName = component.get('displayName').replace(new RegExp('^' + service.get('serviceName') + '\\s', 'i'), '');
+ displayName = App.format.role(component.get('componentName')).replace(new RegExp('^' + service.get('serviceName') + '\\s', 'i'), '');
}
serviceObj.get('service_components').pushObject(Em.Object.create({
component_name: component.get('isClient') ? Em.I18n.t('common.client').toUpperCase() : component.get('componentName'),