Faidon Liambotis has submitted this change and it was merged.
Change subject: geoip: disable show_diff
......................................................................
geoip: disable show_diff
potentially the same issue we've experienced with puppet failing when the diff
contains invalid utf8 byte sequences
Bug: T93614
Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
---
M modules/geoip/manifests/data/puppet.pp
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/geoip/manifests/data/puppet.pp
b/modules/geoip/manifests/data/puppet.pp
index aaacc0c..159d9e1 100644
--- a/modules/geoip/manifests/data/puppet.pp
+++ b/modules/geoip/manifests/data/puppet.pp
@@ -12,12 +12,13 @@
{
# recursively copy the $data_directory from $source.
file { $data_directory:
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0644',
- source => $source,
- recurse => true,
- backup => false,
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ source => $source,
+ recurse => true,
+ backup => false,
+ show_diff => false,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/200147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
