Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292500
Change subject: aptrepo: mv wikimedia-specific distributions file to role
......................................................................
aptrepo: mv wikimedia-specific distributions file to role
This file is specific to wikimedia and should not be in the module.
When, like on bromine, aptrepo::distribution is used, this creates a
conflict and puppet error.
It could also be replaced with aptrepo::distribution instead but
some options are missing for now.
Bug:T132757
Bug:T136793
Change-Id: Ib98634da6745278ab0948ddb14aaf69434fc93a4
---
M modules/aptrepo/manifests/init.pp
M modules/role/manifests/aptrepo/wikimedia.pp
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/292500/1
diff --git a/modules/aptrepo/manifests/init.pp
b/modules/aptrepo/manifests/init.pp
index a19102c..6aa0865 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -74,14 +74,6 @@
mode => '0755',
}
- file { "${basedir}/conf/distributions":
- ensure => present,
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/aptrepo/distributions',
- }
-
file { "${basedir}/conf/updates":
ensure => present,
mode => '0444',
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index e7ff409..bbff17a 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -5,4 +5,12 @@
basedir => '/srv/wikimedia',
}
+ file { "${basedir}/conf/distributions":
+ ensure => present,
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/aptrepo/distributions-wikimedia',
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/292500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib98634da6745278ab0948ddb14aaf69434fc93a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
