Revert "AMBARI-20263. Knox default topology config is wrong for Hbase service (Sandeep More via smohanty)"

This reverts commit d547d5dcc16c7824cbfe5afd9e33dc4913415d77.

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml

@@ -100,7 +100,7 @@
 
             <service>
                 <role>WEBHBASE</role>
-                <url>http://{{hbase_rest_server}}:{{hbase_rest_port}}</url>
+                <url>http://{{hbase_master_host}}:{{hbase_master_port}}</url>
             </service>
 
             <service>

ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py

@@ -212,18 +212,13 @@ if type(webhcat_server_hosts) is list:
 else:
   webhcat_server_host = webhcat_server_hosts
 
+hbase_master_port = default('/configurations/hbase-site/hbase.rest.port', "8080")
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", None)
 if type(hbase_master_hosts) is list:
   hbase_master_host = hbase_master_hosts[0]
 else:
   hbase_master_host = hbase_master_hosts
 
-hbase_rest_port = default('/configurations/hbase-site/hbase.rest.port', "60080")
-hbase_rest_server = default('/configurations/hbase-site/hbase.rest.server.host', None)
-
-if hbase_rest_server is None:
-  hbase_rest_server = hbase_master_host
-
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]