Browse Source

AMBARI-4458 Storm: Activate by default. (Denys Buzhor via atkach)

atkach 11 years ago
parent
commit
18b0b8bfa4

+ 24 - 0
ambari-web/app/assets/data/hosts/HDP2/hosts.json

@@ -300,6 +300,30 @@
             "host_name" : "dev01.hortonworks.com"
           }
         },
+        {
+          "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" : {

+ 24 - 0
ambari-web/app/assets/data/hosts/HDP2/hosts_init.json

@@ -329,6 +329,30 @@
             "state" : "INSTALLED"
           }
         },
+        {
+          "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" : {

+ 0 - 1
ambari-web/app/config.js

@@ -69,7 +69,6 @@ App.supports = {
   deleteHost: true,
   autoRollbackHA: false,
   appTimelineServer: false,
-  storm: false,
   jobs: false
 };
 

+ 0 - 1
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,

+ 3 - 3
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')
   }
 ];

+ 0 - 1
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',

+ 0 - 5
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':