From 89aa846909a4e9871559724358e824e0549d9a37 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@puppet.com>
Date: Wed, 3 Oct 2018 15:20:48 +0100
Subject: [PATCH] (MODULES-7050) - Fix OracleJDK reinstalling on Puppet runs

---
 manifests/oracle.pp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/manifests/oracle.pp b/manifests/oracle.pp
index cf97e6c..36313b8 100644
--- a/manifests/oracle.pp
+++ b/manifests/oracle.pp
@@ -119,7 +119,13 @@ define java::oracle (
     $release_hash  = $url_hash
 
     if $release_major =~ /(\d+)u(\d+)/ {
-      $install_path = "${java_se}1.${1}.0_${2}"
+      # Required for CentOS systems where Java8 update number is >= 171 to ensure
+      # the package is visible to Puppet
+      if $facts['os']['name'] == 'CentOS' and $2 >= '171' {
+        $install_path = "${java_se}1.${1}.0_${2}-amd64"
+      } else {
+        $install_path = "${java_se}1.${1}.0_${2}"
+      }
     } else {
       $install_path = "${java_se}${release_major}${release_minor}"
     }