diff --git a/roles/ask/templates/settings.py b/roles/ask/templates/settings.py index e275e94468..3b5ab14671 100644 --- a/roles/ask/templates/settings.py +++ b/roles/ask/templates/settings.py @@ -268,7 +268,7 @@ CACHES = { 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', 'KEY_PREFIX': 'askfedora', 'LOCATION': [ - 'memcached04:11211', + 'memcached02:11211', ] } } diff --git a/roles/badges/frontend/templates/tahrir.ini b/roles/badges/frontend/templates/tahrir.ini index 769321b9cc..358971de25 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 = memcached03:11211 +dogpile.cache.arguments.url = memcached01:11211 dogpile.cache.arguments.distributed_lock = True diff --git a/roles/datagrepper/templates/datagrepper.cfg b/roles/datagrepper/templates/datagrepper.cfg index 0776e32076..85a62be5b2 100644 --- a/roles/datagrepper/templates/datagrepper.cfg +++ b/roles/datagrepper/templates/datagrepper.cfg @@ -16,7 +16,7 @@ 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': ['memcached03.phx2.fedoraproject.org:11211', 'memcached04.phx2.fedoraproject.org:11211']}} +DATAGREPPER_CACHE_KWARGS={'arguments': {'url': ['memcached01.phx2.fedoraproject.org:11211', 'memcached02.phx2.fedoraproject.org:11211']}} {% endif %} {% if environment == "staging" %} diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 481fa245fe..f2a73cc5c6 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -150,8 +150,8 @@ $wgParserCacheType = CACHE_MEMCACHED; $wgMessageCacheType = CACHE_MEMCACHED; $wgSessionsInMemcached = true; $wgMemCachedServers = array ( - 0 => 'memcached03:11211', - 1 => 'memcached04:11211', + 0 => 'memcached01:11211', + 1 => 'memcached02:11211', ); ## To enable image uploads, make sure the 'images' directory diff --git a/roles/packages/templates/packages-app.ini.j2 b/roles/packages/templates/packages-app.ini.j2 index 73dc0a2b62..15848ef8df 100644 --- a/roles/packages/templates/packages-app.ini.j2 +++ b/roles/packages/templates/packages-app.ini.j2 @@ -134,11 +134,11 @@ moksha.livesocket = False cache.bugzilla.backend=dogpile.cache.memcached cache.bugzilla.expiration_time=300 -cache.bugzilla.arguments.url=memcached03:11211 +cache.bugzilla.arguments.url=memcached01:11211 cache.bugzilla.arguments.distributed_lock=True cache.connectors.backend=dogpile.cache.memcached cache.connectors.expiration_time=300 -cache.connectors.arguments.url=memcached04:11211 +cache.connectors.arguments.url=memcached02:11211 cache.connectors.arguments.distributed_lock=True # For the cache worker daemon @@ -162,7 +162,7 @@ beaker.session.key = fedoracommunity beaker.session.secret = {{ fcommBeakerSessionSecret }} beaker.cache.type = ext:memcached -beaker.cache.url = memcached03:11211;memcached04:11211 +beaker.cache.url = memcached01:11211;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