[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster profiles: add prevent_cherrypicks param

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368340 )

Change subject: puppetmaster profiles: add prevent_cherrypicks param
......................................................................


puppetmaster profiles: add prevent_cherrypicks param

I want to set this to 'false' for labs puppetmasters

Change-Id: I9a4a7d7897fa6d556770c3def934f8ce35a8d0aa
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
M modules/profile/manifests/puppetmaster/backend.pp
M modules/profile/manifests/puppetmaster/frontend.pp
4 files changed, 17 insertions(+), 11 deletions(-)

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



diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml 
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index 5f56466..db7e535 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::backend::secure_private: false
+profile::puppetmaster::backend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml 
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index 4f35aa5..d2b8565 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -6,6 +6,7 @@
   autosign: true
 
 profile::puppetmaster::frontend::secure_private: false
+profile::puppetmaster::frontend::prevent_cherrypicks: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
diff --git a/modules/profile/manifests/puppetmaster/backend.pp 
b/modules/profile/manifests/puppetmaster/backend.pp
index 41d4a7a..77d5562 100644
--- a/modules/profile/manifests/puppetmaster/backend.pp
+++ b/modules/profile/manifests/puppetmaster/backend.pp
@@ -3,6 +3,7 @@
 class profile::puppetmaster::backend(
     $config = hiera('profile::puppetmaster::backend::config', {}),
     $secure_private = hiera('profile::puppetmaster::backend::config', true),
+    $prevent_cherrypicks = 
hiera('profile::puppetmaster::backend::prevent_cherrypicks', true),
     $allow_from = [
       '*.wikimedia.org',
       '*.eqiad.wmnet',
@@ -24,10 +25,11 @@
     }
 
     class { '::puppetmaster':
-        server_type    => 'backend',
-        config         => $::profile::puppetmaster::common::config,
-        secure_private => $secure_private,
-        allow_from     => $allow_from,
+        server_type         => 'backend',
+        config              => $::profile::puppetmaster::common::config,
+        secure_private      => $secure_private,
+        prevent_cherrypicks => $prevent_cherrypicks,
+        allow_from          => $allow_from,
     }
 
     $puppetmaster_frontend_ferm = join(keys(hiera('puppetmaster::servers')), ' 
')
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp 
b/modules/profile/manifests/puppetmaster/frontend.pp
index 0fb84cd..9ccd5a8 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -4,6 +4,7 @@
     $config = hiera('profile::puppetmaster::frontend::config', {}),
     $secure_private = hiera('profile::puppetmaster::frontend::config', true),
     $web_hostname = hiera('profile::puppetmaster::frontend::web_hostname', 
'puppet'),
+    $prevent_cherrypicks = 
hiera('profile::puppetmaster::frontend::prevent_cherrypicks', true),
     $allow_from = [
       '*.wikimedia.org',
       '*.eqiad.wmnet',
@@ -43,13 +44,14 @@
     }
 
     class { '::puppetmaster':
-        bind_address   => '*',
-        server_type    => 'frontend',
-        is_git_master  => true,
-        workers        => $workers,
-        config         => $::profile::puppetmaster::common::config,
-        secure_private => $secure_private,
-        allow_from     => $allow_from,
+        bind_address        => '*',
+        server_type         => 'frontend',
+        is_git_master       => true,
+        workers             => $workers,
+        config              => $::profile::puppetmaster::common::config,
+        secure_private      => $secure_private,
+        prevent_cherrypicks => $prevent_cherrypicks,
+        allow_from          => $allow_from,
     }
 
     # Main site to respond to

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a4a7d7897fa6d556770c3def934f8ce35a8d0aa
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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