AMBARI-2156. zookeeper service check fails when zk client is not co-hosted with zk server. (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1484036 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -865,6 +865,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2156. zookeeper service check fails when zk client is not co-hosted
+ with zk server. (jaimin)
+
  AMBARI-2161. Datanode Start fails in secure cluster. (jaimin)
 
  AMBARI-2160. zookeeper smoke test fails with unknown host exception for

ambari-web/app/controllers/main/service/item.js

@@ -171,7 +171,8 @@ App.MainServiceItemController = Em.Controller.extend({
       'sender': this,
       'success':'runSmokeTestSuccessCallBack',
       'data': {
-        'serviceName': this.get('content.serviceName').toUpperCase()
+        'serviceName': this.get('content.serviceName'),
+        'actionName': this.get('content.serviceName') === 'ZOOKEEPER' ? 'ZOOKEEPER_QUORUM_SERVICE_CHECK' : this.get('content.serviceName') + '_SERVICE_CHECK'
       }
     });
   },

ambari-web/app/utils/ajax.js

@@ -65,7 +65,7 @@ var urls = {
     }
   },
   'service.item.smoke': {
-    'real': '/clusters/{clusterName}/services/{serviceName}/actions/{serviceName}_SERVICE_CHECK',
+    'real': '/clusters/{clusterName}/services/{serviceName}/actions/{actionName}',
     'mock': '/data/wizard/deploy/poll_1.json',
     'format': function () {
       return {