From 2aa1d00087db4702face57d4f7f250e7bc3dcb0a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Feb 2015 17:53:19 +0000 Subject: [PATCH] Switch everything to use memcached02 so we can take 01 down to add memory to it's virthost --- roles/badges/frontend/templates/tahrir.ini | 2 +- roles/datagrepper/templates/datagrepper.cfg | 3 ++- roles/elections/templates/fedora-elections.cfg | 2 +- roles/mediawiki/templates/LocalSettings.php.fp.j2 | 3 +-- roles/packages/web/templates/packages-app.ini.j2 | 4 ++-- roles/pkgdb2/templates/pkgdb2.cfg | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/badges/frontend/templates/tahrir.ini b/roles/badges/frontend/templates/tahrir.ini index 5a8667ee29..05a10d6ec3 100644 --- a/roles/badges/frontend/templates/tahrir.ini +++ b/roles/badges/frontend/templates/tahrir.ini @@ -36,7 +36,7 @@ tahrir.pngs.uri = /usr/share/badges/pngs dogpile.cache.backend = dogpile.cache.memcached dogpile.cache.expiration_time = 100 -dogpile.cache.arguments.url = memcached01:11211 +dogpile.cache.arguments.url = memcached02:11211 dogpile.cache.arguments.distributed_lock = True diff --git a/roles/datagrepper/templates/datagrepper.cfg b/roles/datagrepper/templates/datagrepper.cfg index 85a62be5b2..af5e185fcd 100644 --- a/roles/datagrepper/templates/datagrepper.cfg +++ b/roles/datagrepper/templates/datagrepper.cfg @@ -16,7 +16,8 @@ DATAGREPPER_CACHE_BACKEND='dogpile.cache.memcached' {% if environment == "staging" %} DATAGREPPER_CACHE_KWARGS={'arguments': {'url': 'app01.stg.phx2.fedoraproject.org:11211'}} {% else %} -DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211', 'memcached02.phx2.fedoraproject.org:11211']}} +#DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211', 'memcached02.phx2.fedoraproject.org:11211']}} +DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached02.phx2.fedoraproject.org:11211']}} {% endif %} {% if environment == "staging" %} diff --git a/roles/elections/templates/fedora-elections.cfg b/roles/elections/templates/fedora-elections.cfg index 10a7fe6ef3..a934d2a08f 100644 --- a/roles/elections/templates/fedora-elections.cfg +++ b/roles/elections/templates/fedora-elections.cfg @@ -37,7 +37,7 @@ SESSION_COOKIE_SECURE = True DOGPILE_CACHE = { 'backend': 'dogpile.cache.memcached', 'arguments': { - 'url': ["memcached01:11211", "memcached02:11211"], + 'url': ["memcached02:11211"], 'distributed_lock': True, }, } diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index b508f2435a..93ed1f9da0 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -150,8 +150,7 @@ $wgParserCacheType = CACHE_MEMCACHED; $wgMessageCacheType = CACHE_MEMCACHED; $wgSessionsInMemcached = true; $wgMemCachedServers = array ( - 0 => 'memcached01:11211', - 1 => 'memcached02:11211', + 0 => 'memcached02:11211', ); ## To enable image uploads, make sure the 'images' directory diff --git a/roles/packages/web/templates/packages-app.ini.j2 b/roles/packages/web/templates/packages-app.ini.j2 index 80f3f697c3..d887834855 100644 --- a/roles/packages/web/templates/packages-app.ini.j2 +++ b/roles/packages/web/templates/packages-app.ini.j2 @@ -134,7 +134,7 @@ moksha.livesocket = False cache.bugzilla.backend=dogpile.cache.memcached cache.bugzilla.expiration_time=300 -cache.bugzilla.arguments.url=memcached01:11211 +cache.bugzilla.arguments.url=memcached02:11211 cache.bugzilla.arguments.distributed_lock=True cache.connectors.backend=dogpile.cache.memcached cache.connectors.expiration_time=300 @@ -162,7 +162,7 @@ beaker.session.key = fedoracommunity beaker.session.secret = {{ fcommBeakerSessionSecret }} beaker.cache.type = ext:memcached -beaker.cache.url = memcached01:11211;memcached02:11211 +beaker.cache.url = memcached02:11211 beaker.cache.lock_dir = /var/cache/fedoracommunity/beaker # If you'd like to fine-tune the individual locations of the cache data dirs diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index 5e43862a19..cb4b3a88eb 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -29,7 +29,7 @@ ADMIN_GROUP = ['sysadmin-main', 'cvsadmin'] PKGDB2_CACHE_BACKEND = 'dogpile.cache.memcached' PKGDB2_CACHE_KWARGS = { 'arguments': { - 'url': ["memcached01:11211", "memcached02:11211"], + 'url': ["memcached02:11211"], 'distributed_lock': True, } }