Revert "AMBARI-9908 add quicklinks and host config substitution for accumulo (billie)"

This reverts commit 5796e12de7240dd47411eaa2f25be620b5dab2db.

ambari-web/app/controllers/main/host/details.js

@@ -949,9 +949,6 @@ App.MainHostDetailsController = Em.Controller.extend({
     if (configs['hbase-site']) {
       configs['hbase-site']['hbase.zookeeper.quorum'] = zks.join(',');
     }
-    if (configs['accumulo-site']) {
-      configs['accumulo-site']['instance.zookeeper.host'] = zksWithPort;
-    }
     if (configs['webhcat-site']) {
       configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort;
     }

ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -661,9 +661,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
     if (!App.get('isHaEnabled') && App.Service.find('HBASE').get('isLoaded')) {
       configs['hbase-site']['hbase.rootdir'] = configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020');
     }
-    if (!App.get('isHaEnabled') && App.Service.find('ACCUMULO').get('isLoaded')) {
-      configs['accumulo-site']['instance.volumes'] = configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020');
-    }
   },
 
   /**

ambari-web/app/mappers/service_metrics_mapper.js

@@ -359,8 +359,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
       STORM: [31],
       FALCON: [32],
       RANGER: [33],
-      SPARK: [34],
-      ACCUMULO: [35]
+      SPARK: [34]
     };
     if (quickLinks[item.ServiceInfo.service_name])
       finalJson.quick_links = quickLinks[item.ServiceInfo.service_name];

ambari-web/app/models/quick_links.js

@@ -311,16 +311,5 @@ App.QuickLinks.FIXTURES = [
     site: 'spark-defaults',
     regex: '^(\\d+)$',
     default_http_port: 18080
-  },
-  {
-    id:35,
-    label:'Accumulo Monitor UI',
-    url:'%@://%@:%@/',
-    service_id: 'ACCUMULO',
-    template:'%@://%@:%@/',
-    http_config: 'monitor.port.client',
-    site: 'accumulo-site',
-    regex: '^(\\d+)$',
-    default_http_port: 50095
   }
 ];

ambari-web/app/models/service_config.js

@@ -316,10 +316,6 @@ App.ServiceConfigProperty = Em.Object.extend({
         var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
         this.setDefaultValue(hostWithPrefix,'://' + nnHost);
         break;
-      case 'instance.volumes':
-        var nnHost = masterComponentHostsInDB.filterProperty('component', 'NAMENODE').mapProperty('hostName');
-        this.setDefaultValue(hostWithPrefix,'://' + nnHost);
-        break;
       case 'snamenode_host':
         // Secondary NameNode does not exist when NameNode HA is enabled
         var snn = masterComponentHostsInDB.findProperty('component', 'SECONDARY_NAMENODE');
@@ -560,7 +556,6 @@ App.ServiceConfigProperty = Em.Object.extend({
       case 'templeton.zookeeper.hosts':
       case 'hadoop.registry.zk.quorum':
       case 'hive.cluster.delegation.token.store.zookeeper.connectString':
-      case 'instance.zookeeper.host': // for accumulo
         var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
         var zkHostPort = zkHosts;
         var regex = "\\w*:(\\d+)";   //regex to fetch the port

ambari-web/app/views/common/quick_view_link_view.js

@@ -268,9 +268,6 @@ App.QuickViewLinks = Em.View.extend({
       case "STORM":
         hosts[0] = this.findComponentHost(response.items, "STORM_UI_SERVER");
         break;
-      case "ACCUMULO":
-        hosts[0] = this.findComponentHost(response.items, "ACCUMULO_MONITOR");
-        break;
       default:
         var service = App.StackService.find().findProperty('serviceName', serviceName);
         if (service && service.get('hasMaster')) {