Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312297

Change subject: puppetmaster: Fix enabling cherrypicks in standalone master
......................................................................

puppetmaster: Fix enabling cherrypicks in standalone master

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/312297/1

diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 2344a9a..57a94d5 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -69,11 +69,12 @@
     $allow_from = ['10.0.0.0/8']
 
     class { '::puppetmaster':
-        server_name      => $::fqdn,
-        allow_from       => $allow_from,
-        secure_private   => false,
-        include_conftool => false,
-        config           => merge($encconfig, {
+        server_name         => $::fqdn,
+        allow_from          => $allow_from,
+        secure_private      => false,
+        include_conftool    => false,
+        prevent_cherrypicks => $prevent_cherrypicks,,
+        config              => merge($encconfig, {
             'thin_storeconfigs' => false,
             'autosign'          => $autosign,
         })

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50a019dbdb89210d5713f1e7d98a6d01f28620d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

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

Reply via email to