Dzahn has submitted this change and it was merged.
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 be realized in the role
class not the module itself.
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
---
R modules/aptrepo/files/distributions-wikimedia
M modules/aptrepo/manifests/init.pp
M modules/role/manifests/aptrepo/wikimedia.pp
3 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/files/distributions
b/modules/aptrepo/files/distributions-wikimedia
similarity index 100%
rename from modules/aptrepo/files/distributions
rename to modules/aptrepo/files/distributions-wikimedia
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..8c39cd1 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -1,8 +1,18 @@
# http://apt.wikimedia.org/wikimedia/
class role::aptrepo::wikimedia {
+ $basedir = '/srv/wikimedia'
+
class { '::aptrepo':
- basedir => '/srv/wikimedia',
+ basedir => $basedir,
+ }
+
+ 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: merged
Gerrit-Change-Id: Ib98634da6745278ab0948ddb14aaf69434fc93a4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
