Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Remove no-op template blocks

Browse source 
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 7984b46eb7

Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2020-07-07 17:32:14 +02:00 • committed by nphilipp
parent 1d7ed22f11
commit 80f0769e0f
13 changed files with 0 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

7
roles/fedmsg/base/templates/endpoints-bodhi.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-bugzilla2fedmsg.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-fedocal.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-hotness.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-mailman.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-mbs-backend.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints-odcs-backend.py.j2
View file

@ -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'

7
roles/fedmsg/base/templates/endpoints.py.j2
View file

@ -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'

2
roles/fedmsg/base/templates/logging.py.j2
View file

@ -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 %}

7
roles/fedmsg/base/templates/relay.py.j2
View file

@ -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'

2
roles/totpcgi/templates/configmap.yml
View file

@ -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" %}