From 24aaee64295536e620e79cec7c48216c1b58dcac Mon Sep 17 00:00:00 2001
From: Seddik Alaoui Ismaili <seddikalaouiismaili@gmail.com>
Date: Thu, 5 Dec 2024 22:43:34 +0100
Subject: [PATCH] move apps to memcached02

---
 roles/mailman3/templates/settings.py.j2                       | 4 ----
 roles/mediawiki/templates/LocalSettings.php.fp.j2             | 4 ----
 roles/openshift-apps/badges/templates/tahrir.cfg.py           | 4 ----
 roles/openshift-apps/elections/templates/fedora-elections.cfg | 4 ----
 roles/openshift-apps/koschei/templates/config-backend.cfg.j2  | 4 ----
 roles/openshift-apps/koschei/templates/config-frontend.cfg.j2 | 4 ----
 roles/packages3/web/templates/packages-app.ini.j2             | 4 ----
 7 files changed, 28 deletions(-)

diff --git a/roles/mailman3/templates/settings.py.j2 b/roles/mailman3/templates/settings.py.j2
index 4fa7db99d9..c28b1a52fa 100644
--- a/roles/mailman3/templates/settings.py.j2
+++ b/roles/mailman3/templates/settings.py.j2
@@ -392,11 +392,7 @@ LOGGING = {
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
-        {% if env == 'staging' %}
         'LOCATION': 'memcached02:11211',
-        {% else %}
-        'LOCATION': 'memcached01:11211',
-        {% endif %}
     }
 }
 
diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 530c9441a1..182391052b 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -158,11 +158,7 @@ $wgParserCacheType = CACHE_MEMCACHED;
 $wgMessageCacheType = CACHE_MEMCACHED;
 $wgSessionsInMemcached = true;
 $wgMemCachedServers = array (
-	{% if env == 'staging' %}
   	0 => 'memcached02:11211',
-	{% else %}
-	0 => 'memcached01:11211',
-	{% endif %}
 );
 
 ## To enable image uploads, make sure the 'images' directory
diff --git a/roles/openshift-apps/badges/templates/tahrir.cfg.py b/roles/openshift-apps/badges/templates/tahrir.cfg.py
index e09b66d0ce..7a6f6a526a 100644
--- a/roles/openshift-apps/badges/templates/tahrir.cfg.py
+++ b/roles/openshift-apps/badges/templates/tahrir.cfg.py
@@ -51,11 +51,7 @@ CACHE = {
     "backend": "dogpile.cache.null",
     "expiration_time": 100,
     "arguments": {
-        {% if env == 'staging' %}
         "url": "memcached02{{env_suffix}}:11211",
-        {% else %}
-        "url": "memcached01{{env_suffix}}:11211",
-        {% endif %}
     "distributed_lock": True,
     "lock_timeout": 5,
     },
diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg
index 1cda174778..4134d8e8d5 100644
--- a/roles/openshift-apps/elections/templates/fedora-elections.cfg
+++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg
@@ -50,11 +50,7 @@ SESSION_COOKIE_NAME = 'elections'
 DOGPILE_CACHE = {
     'backend': 'dogpile.cache.memcached',
     'arguments': {
-        {% if env == 'staging' %}
         'url': ["memcached02:11211"],
-        {% else %}
-        'url': ["memcached01:11211"],
-        {% endif %}
         'distributed_lock': True,
     },
 }
diff --git a/roles/openshift-apps/koschei/templates/config-backend.cfg.j2 b/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
index d04408b5c5..1885619eed 100644
--- a/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
+++ b/roles/openshift-apps/koschei/templates/config-backend.cfg.j2
@@ -159,11 +159,7 @@ config = {
             "backend": "dogpile.cache.memcached",
             "expiration_time": None,
             "arguments": {
-                {% if env == 'staging' %}
                 "url": "memcached02",
-                {% else %}
-                "url": "memcached01",
-                {% endif %}
             },
         },
     },
diff --git a/roles/openshift-apps/koschei/templates/config-frontend.cfg.j2 b/roles/openshift-apps/koschei/templates/config-frontend.cfg.j2
index 9a5419aad2..2d66ef00ad 100644
--- a/roles/openshift-apps/koschei/templates/config-frontend.cfg.j2
+++ b/roles/openshift-apps/koschei/templates/config-frontend.cfg.j2
@@ -54,11 +54,7 @@ config = {
                 "backend": "dogpile.cache.memcached",
                 "expiration_time": 3600,  # 1 hour
                 "arguments": {
-                    {% if env == 'staging' %}
                     "url": "memcached02:11211",
-                    {% else %}
-                    "url": "memcached01:11211",
-                    {% endif %}
                 },
             },
         },
diff --git a/roles/packages3/web/templates/packages-app.ini.j2 b/roles/packages3/web/templates/packages-app.ini.j2
index 0441a32eda..a80baf8883 100644
--- a/roles/packages3/web/templates/packages-app.ini.j2
+++ b/roles/packages3/web/templates/packages-app.ini.j2
@@ -146,11 +146,7 @@ beaker.session.key = fedoracommunity
 beaker.session.secret = {{ fcommBeakerSessionSecret }}
 
 beaker.cache.type = ext:memcached
-{% if env == 'staging' %}
 beaker.cache.url = memcached02:11211
-{% else %}
-beaker.cache.url = memcached01:11211
-{% endif %}
 beaker.cache.lock_dir = /var/cache/fedoracommunity/beaker
 
 # If you'd like to fine-tune the individual locations of the cache data dirs