Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350799 )
Change subject: Revert "puppetmaster: Re-depool puppetmaster1002"
......................................................................
Revert "puppetmaster: Re-depool puppetmaster1002"
Row D network maintenance is over, we can now safely repool
puppetmaster1002
Bug: T148506
This reverts commit ab5c7d58c8a8c858fdd55971a953ee095a8aa648.
Change-Id: Icdde21384e1a64d567445d3c908c2408bb99b301
---
M hieradata/common/puppetmaster.yaml
M modules/puppetmaster/manifests/init.pp
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/puppetmaster.yaml
b/hieradata/common/puppetmaster.yaml
index cdbeaa1..a7a0d04 100644
--- a/hieradata/common/puppetmaster.yaml
+++ b/hieradata/common/puppetmaster.yaml
@@ -1,7 +1,7 @@
puppetmaster::servers:
puppetmaster1001.eqiad.wmnet:
- { worker: puppetmaster1001.eqiad.wmnet, loadfactor: 10 }
- - { worker: puppetmaster1002.eqiad.wmnet, loadfactor: 20, offline: true }
+ - { worker: puppetmaster1002.eqiad.wmnet, loadfactor: 20 }
- { worker: rhodium.eqiad.wmnet, loadfactor: 20 }
puppetmaster2001.codfw.wmnet:
- { worker: puppetmaster2001.codfw.wmnet, loadfactor: 10 }
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index 10ea37b..c8613aa 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -17,12 +17,9 @@
# Hash containing all config settings for the [master] section of
# puppet.conf (ini-style)
# - $workers:
-# Array of hashes in the following form
+# Array of hashes in the form. If loadfactor is omitted, it is assumed
to
+# be equal to 1
# [{ 'worker' => 'worker1.example.com', loadfactor => '1' }]
-# If loadfactor is omitted, it is assumed by apache to be equal to 1
-# An offline parameter is supported to allow fully depooling a host
-# without removing it from the stanza. Any of apache mod_proxy
-# BalancerMember parameters may be added
# - $hiera_config:
# Specifies which file to use for hiera.yaml. Defaults to $::realm
# - $is_git_master:
--
To view, visit https://gerrit.wikimedia.org/r/350799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdde21384e1a64d567445d3c908c2408bb99b301
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
