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-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>

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>

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');
 

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,

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'),