Alexandros Kosiaris has submitted this change and it was merged.

Change subject: service::node support overriding the repository
......................................................................


service::node support overriding the repository

service node hardcodes the repository to clone from to
"${title}/deploy". However there are cases like tilerator::ui where we
want to override that and specify a different repo. Also add an if guard
check to avoid duplicate definitions allowing different projects on the
same node to share repositories

Change-Id: I6a9d54b2d99e1d3206dc124307f02a96ba5a8fa9
---
M modules/service/manifests/node.pp
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Mobrovac: Looks good to me, but someone else must approve
  Yurik: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index 06e739b..8525450 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -62,6 +62,7 @@
     $no_file = 10000,
     $healthcheck_url='/_info',
     $has_spec = false,
+    $repo = "${title}/deploy",
     ) {
     # Import all common configuration
     include service::configuration
@@ -89,8 +90,10 @@
 
     # Software and the deployed code, firejail for containment
     require_package('nodejs', 'nodejs-legacy', 'firejail')
-    package { "${title}/deploy":
-        provider => 'trebuchet',
+    if ! defined(Package[$repo]) {
+        package { $repo:
+            provider => 'trebuchet',
+        }
     }
 
     # User/group

-- 
To view, visit https://gerrit.wikimedia.org/r/247846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a9d54b2d99e1d3206dc124307f02a96ba5a8fa9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to