AMBARI-5146. After Ambari is upgraded to 1.5.0, previous JAVA_HOME is overwritten to /usr/jdk64/jdk1.6.0_3 (Vitaly Brodetskyi via dlysnichenko)

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/hook.py

@@ -32,6 +32,7 @@ class BeforeConfigureHook(Hook):
     setup_java()
     setup_hadoop()
     setup_configs()
+    create_javahome_symlink()
 
 if __name__ == "__main__":
   BeforeConfigureHook().execute()

ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py

@@ -303,3 +303,9 @@ def install_snappy():
     format("mkdir -p {so_target_dir_x86}; ln -sf {so_src_x86} {so_target_x86}"))
   Execute(
     format("mkdir -p {so_target_dir_x64}; ln -sf {so_src_x64} {so_target_x64}"))
+
+
+def create_javahome_symlink():
+  if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"):
+    Execute("mkdir -p /usr/jdk64/")
+    Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31")

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/hook.py

@@ -32,6 +32,7 @@ class BeforeConfigureHook(Hook):
     setup_java()
     setup_hadoop()
     setup_configs()
+    create_javahome_symlink()
 
 if __name__ == "__main__":
   BeforeConfigureHook().execute()

ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

@@ -309,3 +309,9 @@ def install_snappy():
     format("mkdir -p {so_target_dir_x86}; ln -sf {so_src_x86} {so_target_x86}"))
   Execute(
     format("mkdir -p {so_target_dir_x64}; ln -sf {so_src_x64} {so_target_x64}"))
+
+
+def create_javahome_symlink():
+  if os.path.exists("/usr/jdk/jdk1.6.0_31") and not os.path.exists("/usr/jdk64/jdk1.6.0_31"):
+    Execute("mkdir -p /usr/jdk64/")
+    Execute("ln -s /usr/jdk/jdk1.6.0_31 /usr/jdk64/jdk1.6.0_31")