[MediaWiki-commits] [Gerrit] Wrapping some package openjdk-7-jdk installs in if !defined - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Wrapping some package openjdk-7-jdk installs in if !defined
......................................................................


Wrapping some package openjdk-7-jdk installs in if !defined

Change-Id: I34e22d6258ee5df6fb59b3678f6af1089bc77525
---
M manifests/misc/statistics.pp
M manifests/role/analytics.pp
M manifests/role/analytics/hadoop.pp
3 files changed, 13 insertions(+), 3 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index df37ccc..8459fe8 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -122,7 +122,11 @@
 
 # Installs java.
 class misc::statistics::packages::java {
-    package { 'openjdk-7-jdk': }
+    if !defined(Package['openjdk-7-jdk']) {
+        package { 'openjdk-7-jdk':
+            ensure => 'installed',
+        }
+    }
 }
 
 # Mounts /data from dataset2 server.
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 0fabfa2..d2f4b41 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -18,7 +18,11 @@
     # ownership.
     include misc::statistics::user
 
-    package { 'openjdk-7-jdk': }
+    if !defined(Package['openjdk-7-jdk']) {
+        package { 'openjdk-7-jdk':
+            ensure => 'installed',
+        }
+    }
 }
 
 # == Class role::analytics::clients
diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 9149d06..5c9a353 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -24,7 +24,9 @@
 class role::analytics::hadoop::client {
     # need java before hadoop is installed
     if (!defined(Package['openjdk-7-jdk'])) {
-        package { 'openjdk-7-jdk': }
+        package { 'openjdk-7-jdk':
+            ensure => 'installed',
+        }
     }
 
     # include common labs or production hadoop configs

-- 
To view, visit https://gerrit.wikimedia.org/r/109686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I34e22d6258ee5df6fb59b3678f6af1089bc77525
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits