AMBARI-1762. SUSE_Unable to start hive. (swagle)

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

CHANGES.txt

@@ -541,6 +541,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1762. SUSE_Unable to start hive. (swagle)
+
  AMBARI-1761. Update the DDL update script to modify the table to
  include ph_cpu_count. (smohanty)
 

ambari-agent/src/main/puppet/modules/hdp-mysql/files/addMysqlUser.sh

@@ -24,6 +24,7 @@ mysqldservice=$1
 mysqldbuser=$2
 mysqldbpasswd=$3
 mysqldbhost=$4
+myhostname=$(hostname -f)
 
 service $mysqldservice start
 echo "Adding user $mysqldbuser@$mysqldbhost and $mysqldbuser@localhost"
@@ -31,5 +32,10 @@ mysql -u root -e "CREATE USER '$mysqldbuser'@'$mysqldbhost' IDENTIFIED BY '$mysq
 mysql -u root -e "CREATE USER '$mysqldbuser'@'localhost' IDENTIFIED BY '$mysqldbpasswd';"
 mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'$mysqldbhost';"
 mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'localhost';"
+if [ '$(mysql -u root -e "select user from mysql.user where user='$mysqldbuser' and host='$myhostname'" | grep "$mysqldbuser")' != '0' ]; then
+  echo "Adding user $mysqldbuser@$myhostname";
+  mysql -u root -e "CREATE USER '$mysqldbuser'@'$myhostname' IDENTIFIED BY '$mysqldbpasswd';";
+  mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'$myhostname';";
+fi
 mysql -u root -e "flush privileges;"
 service $mysqldservice stop