Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201598
Change subject: Fix duplicate Package[gdb] declaration
......................................................................
Fix duplicate Package[gdb] declaration
Bug: T94917
Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
---
M modules/base/manifests/standard-packages.pp
M modules/java/manifests/tools.pp
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/201598/1
diff --git a/modules/base/manifests/standard-packages.pp
b/modules/base/manifests/standard-packages.pp
index b10f605..9a38ff8 100644
--- a/modules/base/manifests/standard-packages.pp
+++ b/modules/base/manifests/standard-packages.pp
@@ -14,7 +14,6 @@
'zsh-beta',
'xfsprogs',
'screen',
- 'gdb',
'iperf',
'atop',
'htop',
@@ -37,6 +36,13 @@
ensure => latest,
}
+ # Can clash with java::tools class
+ if ! defined ( Package['gdb'] ) {
+ package { 'gdb':
+ ensure => latest
+ }
+ }
+
# This should be in $packages, but moved here temporarily because it's
# currently broken on jessie hosts...
if ! os_version('debian >= jessie') {
diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp
index 61c6273..d40e26c 100644
--- a/modules/java/manifests/tools.pp
+++ b/modules/java/manifests/tools.pp
@@ -4,6 +4,8 @@
# java (JRE or JDK) is installed.
class java::tools {
+
+ # Can clash with base::standard-packages class
if ! defined ( Package['gdb'] ) {
package { 'gdb':
ensure => present
--
To view, visit https://gerrit.wikimedia.org/r/201598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
