Ori.livneh has submitted this change and it was merged.

Change subject: nutcracker: add UNIX domain socket server pool everywhere, but 
don't use it
......................................................................


nutcracker: add UNIX domain socket server pool everywhere, but don't use it

This patch is optimistic preparation for moving everything to a UNIX domain
socket.

Change-Id: I81cf69307e9c537b5d11b46830276c43ca9d8179
---
M manifests/role/mediawiki.pp
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 73d386c..fd524c2 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -21,11 +21,8 @@
             server_failure_limit => 3,
             timeout              => 250,
             servers              => hiera('mediawiki_memcached_servers'),
-        }
-    }
-    # Test having nutcracker listen on a UNIX domain socket. -- Ori, 2015-01-08
-    if $::hostname == 'mw1230' or $::hostname == 'mw1231' {
-        $nutcracker_pools['mc-unix'] = {
+        },
+        'mc-unix' => {
             auto_eject_hosts     => true,
             distribution         => 'ketama',
             hash                 => 'md5',
@@ -35,7 +32,7 @@
             server_failure_limit => 3,
             timeout              => 250,
             servers              => hiera('mediawiki_memcached_servers'),
-        }
+        },
     }
 
     class { '::nutcracker':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81cf69307e9c537b5d11b46830276c43ca9d8179
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to