Browse Source

AMBARI-203. Fix for duplicate jdk definition (ramya via omalley)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1337183 13f79535-47bb-0310-9956-ffa450edef68
Owen O'Malley 13 years ago
parent
commit
b954f762a8
2 changed files with 4 additions and 2 deletions
  1. 2 0
      CHANGES.txt
  2. 2 2
      hmc/puppet/modules/hdp/manifests/java/package.pp

+ 2 - 0
CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 
 Release 0.x.x - unreleased
 Release 0.x.x - unreleased
 
 
+  AMBARI-203. Fix for duplicate jdk definition (ramya via omalley)
+
   AMBARI-202. Add check to verify jdk path after install (ramya via vgogate)
   AMBARI-202. Add check to verify jdk path after install (ramya via vgogate)
 
 
   AMBARI-201. reduce db query logging (hitesh via vgogate)
   AMBARI-201. reduce db query logging (hitesh via vgogate)

+ 2 - 2
hmc/puppet/modules/hdp/manifests/java/package.pp

@@ -39,11 +39,11 @@ define hdp::java::package(
     path    => ["/bin","/usr/bin/"]
     path    => ["/bin","/usr/bin/"]
   }
   }
  
  
-  file { "${java_exec}":
+  file { "${java_exec} ${name}":
   ensure => present
   ensure => present
   }   
   }   
  
  
-  anchor{"hdp::java::package::${name}::begin":} -> Exec["${curl_cmd} ${name}"] ->  Exec["${install_cmd} ${name}"] -> File["${java_exec}"] -> anchor{"hdp::java::package::${name}::end":}
+  anchor{"hdp::java::package::${name}::begin":} -> Exec["${curl_cmd} ${name}"] ->  Exec["${install_cmd} ${name}"] -> File["${java_exec} ${name}"] -> anchor{"hdp::java::package::${name}::end":}
   if ($include_artifact_dir == true) {
   if ($include_artifact_dir == true) {
     Anchor["hdp::java::package::${name}::begin"] -> Hdp::Artifact_dir["java::package::${name}"] -> Exec["${curl_cmd} ${name}"]
     Anchor["hdp::java::package::${name}::begin"] -> Hdp::Artifact_dir["java::package::${name}"] -> Exec["${curl_cmd} ${name}"]
   }
   }