Yuvipanda has submitted this change and it was merged.

Change subject: puppetmaster: Enable cherrypicks by default in standalone role
......................................................................


puppetmaster: Enable cherrypicks by default in standalone role

Is used for labs per-project puppetmasters, where cherrypicking
does occur a lot.

Change-Id: Idbf30cba517733cc49229a3a7d9f10cd313bb67f
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 458b497..2344a9a 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -12,8 +12,13 @@
 #  certificate signing requests. Note that if you want to
 #  keep any secrets secure in your puppetmaster, you *can not*
 #  use this, and will have to sign manually.
+#
+# [*prevent_cherrypicks*]
+#  Set to true to prevent manual cherry-picking / modification of
+#  the puppet git repository. Is accomplished using git hooks.
 class role::puppetmaster::standalone(
     $autosign = false,
+    $prevent_cherrypicks = false,
     $use_enc = true,
 ) {
     include ldap::role::config::labs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbf30cba517733cc49229a3a7d9f10cd313bb67f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@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