From 80f0769e0fdb93557021a8e4b17cac6e5153a58d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Jul 15 2020 15:29:20 +0000
Subject: Remove no-op template blocks


Renaming PHX2 -> IAD2 with existing IAD2 conditional template blocks
left some in the form...:

{% if datacenter == 'iad2' %}
...
{% elif datacenter == 'iad2' %}
...

...making the second block a no-op. Remove them.

Follow up to commit 7984b46eb79575516fe6d5179a52d4bf11ddc6e6

Signed-off-by: Nils Philippsen <nils@redhat.com>

---

diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
index 6f98098..b1d6cd9 100644
--- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2 b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2
index fb597f4..776a4e8 100644
--- a/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
index 3bde2d3..0c555c0 100644
--- a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-fedocal.py.j2 b/roles/fedmsg/base/templates/endpoints-fedocal.py.j2
index f08f709..bfc7615 100644
--- a/roles/fedmsg/base/templates/endpoints-fedocal.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fedocal.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
index 6c59b82..6cc6887 100644
--- a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-hotness.py.j2 b/roles/fedmsg/base/templates/endpoints-hotness.py.j2
index 5865f7c..691a9a8 100644
--- a/roles/fedmsg/base/templates/endpoints-hotness.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-hotness.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-mailman.py.j2 b/roles/fedmsg/base/templates/endpoints-mailman.py.j2
index 0d7c39c..73d9850 100644
--- a/roles/fedmsg/base/templates/endpoints-mailman.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-mailman.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2
index aa87c9a..6b97bab 100644
--- a/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2 b/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
index 80d08a4..8e6f6dd 100644
--- a/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 17ffed4..008d7e8 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2
index ca4fc59..2aeefa5 100644
--- a/roles/fedmsg/base/templates/logging.py.j2
+++ b/roles/fedmsg/base/templates/logging.py.j2
@@ -220,8 +220,6 @@ config = dict(
                 "level": "ERROR",
 {% if datacenter == 'iad2' %}
                 "mailhost": "bastion.iad2.fedoraproject.org",
-{% elif datacenter == 'iad2' %}
-                "mailhost": "bastion.iad2.fedoraproject.org",
 {% else %}
                 "mailhost": "bastion.vpn.fedoraproject.org",
 {% endif %}
diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2
index 61275ff..64c9c71 100644
--- a/roles/fedmsg/base/templates/relay.py.j2
+++ b/roles/fedmsg/base/templates/relay.py.j2
@@ -5,13 +5,6 @@ suffix  = 'stg.iad2.fedoraproject.org'
 suffix = 'iad2.fedoraproject.org'
 vpn_suffix = 'vpn.fedoraproject.org'
 {% endif %}
-{% elif datacenter == 'iad2' %}
-{% if env == 'staging' %}
-suffix  = 'stg.iad2.fedoraproject.org'
-{% else %}
-suffix = 'iad2.fedoraproject.org'
-vpn_suffix = 'vpn.fedoraproject.org'
-{% endif %}
 {% else %}
 {% if env == 'staging' %}
 suffix  = 'stg.fedoraproject.org'
diff --git a/roles/totpcgi/templates/configmap.yml b/roles/totpcgi/templates/configmap.yml
index f4375f8..fc059a8 100644
--- a/roles/totpcgi/templates/configmap.yml
+++ b/roles/totpcgi/templates/configmap.yml
@@ -107,8 +107,6 @@ data:
         ServerName fas-all.vpn.fedoraproject.org:8443
 {% elif datacenter == 'iad2' %}
         ServerName fas-all.iad2.fedoraproject.org:8443
-{% elif datacenter == 'iad2' %}
-        ServerName fas-all.iad2.fedoraproject.org:8443
 {% endif %}
         SSLEngine on
 {% if objectname == "configmap-totpcgi-vpn.yml" %}