Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/122708
Change subject: pbuilder: remove labs builder, redundant per https://gerrit.wikimedia.org/r/#/c/122707/1/modules/contint/manifests/packages/labs.pp ...................................................................... pbuilder: remove labs builder, redundant per https://gerrit.wikimedia.org/r/#/c/122707/1/modules/contint/manifests/packages/labs.pp Change-Id: If68f863bf617a9d40f479f4909e799bc535b2132 --- M manifests/role/package.pp 1 file changed, 1 insertion(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/122708/1 diff --git a/manifests/role/package.pp b/manifests/role/package.pp index ef6aed9..ef1a264 100644 --- a/manifests/role/package.pp +++ b/manifests/role/package.pp @@ -5,7 +5,7 @@ class role::package::builder { if $::realm == 'labs' { - fail( 'On labs please use package::builder::labs instead') + fail( 'Please do not use this class on labs') } system::role { 'role::package::builder': description => 'Debian package builder' } @@ -13,39 +13,3 @@ include misc::package-builder } -# == Class: package::pbuilder::labs -# -# Role wrapper around misc::package-pbuilder suitable for labs. Since pbuilder -# use a fairly large amount of disk space and labs instance in eqiad have a -# pretty much filled out 2GB partition for /var, we have to mount the remaining -# disk space on /mnt and point pbuilder to it. -# -# This class depends on role::labs::lvm::mnt to provide the additional disk -# space at /mnt. You must include it. -# -class role::package::builder::labs { - - if $::realm == 'production' { - fail( 'On production please use package::builder instead') - } - - system::role { 'role::package::builder::labs': description => 'Debian package builder on labs' } - - # Changing this would need manual cleanup on all labs instance using - # this class! - $pbuilder_root_labs = '/mnt/pbuilder' - - file { $pbuilder_root_labs: - ensure => directory, - owner => 'root', - group => 'root', - mode => '0775', - require => Class['role::labs::lvm::mnt'] - } - - class { 'misc::package-builder': - pbuilder_root => $pbuilder_root_labs, - require => File[$pbuilder_root_labs], - } - -} -- To view, visit https://gerrit.wikimedia.org/r/122708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If68f863bf617a9d40f479f4909e799bc535b2132 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya <mata...@foss.co.il> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
