AMBARI-5021. 2.1.1 is hard coded in our python scripts which causes

WEBHCAT install to fail. (aonishuk)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py

@@ -107,12 +107,14 @@ mysql_host = config['clusterHostInfo']['hive_mysql_host']
 mysql_adduser_path = "/tmp/addMysqlUser.sh"
 
 ########## HCAT
-if config['hostLevelParams']['stack_version'] == '2.1.1':
-  hcat_conf_dir = '/etc/hive-hcatalog/conf'
-  hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
-else:
+
+if str(config['hostLevelParams']['stack_version']).startswith('2.0'):
   hcat_conf_dir = '/etc/hcatalog/conf'
   hcat_lib = '/usr/lib/hcatalog/share/hcatalog'
+# for newer versions
+else:
+  hcat_conf_dir = '/etc/hive-hcatalog/conf'
+  hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
 
 
 metastore_port = 9933

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py

@@ -30,12 +30,13 @@ hcat_user = config['configurations']['global']['hcat_user']
 webhcat_user = config['configurations']['global']['webhcat_user']
 download_url = config['configurations']['global']['apache_artifacts_download_url']
 
-if config['hostLevelParams']['stack_version'] == '2.1.1':
-  config_dir = '/etc/hive-webhcat/conf'
-  webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin'
-else:
+if str(config['hostLevelParams']['stack_version']).startswith('2.0'):
   config_dir = '/etc/hcatalog/conf'
   webhcat_bin_dir = '/usr/lib/hcatalog/sbin'
+# for newer versions
+else:
+  config_dir = '/etc/hive-webhcat/conf'
+  webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin'
 
 templeton_log_dir = config['configurations']['global']['hcat_log_dir']
 templeton_pid_dir = status_params.templeton_pid_dir