[MediaWiki-commits] [Gerrit] swift: don't show diff for builder files - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200146

Change subject: swift: don't show diff for builder files
......................................................................

swift: don't show diff for builder files

puppet will bail trying to log non-utf8 byte sequences in the diff

Bug: T93614
Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
---
M manifests/swift.pp
M modules/swift_new/manifests/ring.pp
2 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/200146/1

diff --git a/manifests/swift.pp b/manifests/swift.pp
index dd817f2..53d7e54 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -64,8 +64,9 @@
     }
 
     file { '/etc/swift/account.builder':
-        ensure => 'present',
-        source => "puppet:///volatile/swift/${cluster_name}/account.builder",
+        ensure    => 'present',
+        source    => 
"puppet:///volatile/swift/${cluster_name}/account.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/account.ring.gz':
@@ -76,6 +77,7 @@
     file { '/etc/swift/container.builder':
         ensure => 'present',
         source => "puppet:///volatile/swift/${cluster_name}/container.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/container.ring.gz':
@@ -86,6 +88,7 @@
     file { '/etc/swift/object.builder':
         ensure => 'present',
         source => "puppet:///volatile/swift/${cluster_name}/object.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/object.ring.gz':
diff --git a/modules/swift_new/manifests/ring.pp 
b/modules/swift_new/manifests/ring.pp
index c56e129..ea461a7 100644
--- a/modules/swift_new/manifests/ring.pp
+++ b/modules/swift_new/manifests/ring.pp
@@ -3,8 +3,9 @@
     $swift_cluster = $swift_new::params::swift_cluster,
 ) {
     file { '/etc/swift/account.builder':
-        ensure => present,
-        source => "puppet:///volatile/swift/${swift_cluster}/account.builder",
+        ensure    => present,
+        source    => 
"puppet:///volatile/swift/${swift_cluster}/account.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/account.ring.gz':
@@ -13,8 +14,9 @@
     }
 
     file { '/etc/swift/container.builder':
-        ensure => present,
-        source => 
"puppet:///volatile/swift/${swift_cluster}/container.builder",
+        ensure    => present,
+        source    => 
"puppet:///volatile/swift/${swift_cluster}/container.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/container.ring.gz':
@@ -23,8 +25,9 @@
     }
 
     file { '/etc/swift/object.builder':
-        ensure => present,
-        source => "puppet:///volatile/swift/${swift_cluster}/object.builder",
+        ensure    => present,
+        source    => 
"puppet:///volatile/swift/${swift_cluster}/object.builder",
+        show_diff => false,
     }
 
     file { '/etc/swift/object.ring.gz':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>

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