AMBARI-7519 Modify HiveServer2 dynamic service discovery config defaults & add ZooKeeper as a dependency for Hive in Ambari. (ababiichuk)

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

@@ -712,7 +712,9 @@ App.MainHostDetailsController = Em.Controller.extend({
       configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort;
     }
     if (configs['hive-site']) {
-      configs['hive-site']['hive.zookeeper.quorum'] = zksWithPort;
+      if (App.get('isHadoop22Stack')) {
+        configs['hive-site']['hive.zookeeper.quorum'] = zksWithPort;
+      }
       configs['hive-site']['hive.cluster.delegation.token.store.zookeeper.connectString'] = zksWithPort;
     }
     if (configs['storm-site']) {

ambari-web/app/data/HDP2.2/site_properties.js

@@ -23,6 +23,18 @@ var hdp22properties = hdp2properties.filter(function (item){
   return item.name !== 'storm.thrift.transport' && item.name !== 'storm_rest_api_host';
 });
 
+hdp22properties.push(
+{
+  "id": "site property",
+  "name": "hive.zookeeper.quorum",
+  "displayName": "hive.zookeeper.quorum",
+  "defaultValue": "localhost:2181",
+  "displayType": "multiLine",
+  "isVisible": true,
+  "serviceName": "HIVE",
+  "category": "Advanced hive-site"
+});
+
 module.exports =
 {
   "configProperties": hdp22properties

ambari-web/app/data/HDP2/site_properties.js

@@ -547,16 +547,6 @@ module.exports =
       "category": "Advanced hive-site",
       "serviceName": "HIVE"
     },
-    {
-      "id": "site property",
-      "name": "hive.zookeeper.quorum",
-      "displayName": "hive.zookeeper.quorum",
-      "defaultValue": "localhost:2181",
-      "displayType": "multiLine",
-      "isVisible": true,
-      "serviceName": "HIVE",
-      "category": "Advanced hive-site"
-    },
   /**********************************************tez-site*****************************************/
     {
       "id": "site property",

ambari-web/test/controllers/main/host/details_test.js

@@ -559,13 +559,26 @@ describe('App.MainHostDetailsController', function () {
         "templeton.zookeeper.hosts": "host1:2181"
       }});
     });
-    it('hive-site is present', function () {
+    it('hive-site is present and stack < 2.2', function () {
+      var version = App.get('currentStackVersion');
       var configs = {'hive-site': {}};
+      App.set('currentStackVersion', 'HDP-2.1.0');
+      expect(controller.setZKConfigs(configs, 'host1:2181', [])).to.be.true;
+      expect(configs).to.eql({"hive-site": {
+        'hive.cluster.delegation.token.store.zookeeper.connectString': "host1:2181"
+      }});
+      App.set('currentStackVersion', version);
+    });
+    it('hive-site is present and stack > 2.2', function () {
+      var version = App.get('currentStackVersion');
+      var configs = {'hive-site': {}};
+      App.set('currentStackVersion', 'HDP-2.2.0');
       expect(controller.setZKConfigs(configs, 'host1:2181', [])).to.be.true;
       expect(configs).to.eql({"hive-site": {
         'hive.cluster.delegation.token.store.zookeeper.connectString': "host1:2181",
         'hive.zookeeper.quorum': "host1:2181"
       }});
+      App.set('currentStackVersion', version);
     });
     it('storm-site is present', function () {
       var configs = {'storm-site': {}};