Volans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398303 )

Change subject: base: fix dependency relationship
......................................................................

base: fix dependency relationship

* The debconf setting must be set before installing the package. With
  Puppet 4 clients this no longer works as the ordering is enforced
  properly by Puppet and make the reimage stuck during the first puppet
  run.

Bug: T182702
Change-Id: I722bf977ecb97a32c96027d398542af6b0735fe0
---
M modules/base/manifests/standard_packages.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/398303/1

diff --git a/modules/base/manifests/standard_packages.pp 
b/modules/base/manifests/standard_packages.pp
index 04f20b1..9804743 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -40,7 +40,6 @@
         'tcpdump',
         'tmux',
         'tree',
-        'tshark',
         'vim',
         'vim-addon-manager',
         'vim-scripts',
@@ -88,10 +87,11 @@
         require_package('mcelog')
     }
 
-    # Pulled in via tshark above, defaults to "no"
+    # Pulled in via tshark below, defaults to "no"
     debconf::seen { 'wireshark-common/install-setuid':
-        require => Package['tshark'],
+        before => Package['tshark'],
     }
+    package { 'tshark': ensure => present }
 
     # An upgrade from jessie to stretch leaves some old binary
     # packages around, remove those

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I722bf977ecb97a32c96027d398542af6b0735fe0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>

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

Reply via email to