Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374813 )
Change subject: aptly: support components for clients
......................................................................
aptly: support components for clients
'main' is hardcoded which prevents use of different components on the
client side.
Change-Id: I3cbdc3d7d3e64ffeb60ac76acfcbfc6d0693212a
---
M modules/aptly/manifests/client.pp
M modules/role/manifests/aptly/client.pp
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptly/manifests/client.pp
b/modules/aptly/manifests/client.pp
index c012b03..52cb61a 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -1,11 +1,12 @@
class aptly::client(
$servername,
- $source=false
+ $source=false,
+ $components='main',
) {
apt::repository { 'project-aptly':
uri => "http://${servername}/repo";,
dist => "${::lsbdistcodename}-${::labsproject}",
- components => 'main',
+ components => $components,
source => $source,
trust_repo => true,
}
diff --git a/modules/role/manifests/aptly/client.pp
b/modules/role/manifests/aptly/client.pp
index 7e426f5..13b74dc 100644
--- a/modules/role/manifests/aptly/client.pp
+++ b/modules/role/manifests/aptly/client.pp
@@ -3,8 +3,10 @@
# Sets up a simple deb package that points to the project's aptly server
class role::aptly::client(
$servername =
"${::labsproject}-packages.${::labsproject}.${::site}.wmflabs",
+ $components = 'main',
) {
class { '::aptly::client':
servername => $servername,
+ components => $components,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/374813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cbdc3d7d3e64ffeb60ac76acfcbfc6d0693212a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
