diff --git a/roles/bodhi2/base/templates/configmap.yml b/roles/bodhi2/base/templates/configmap.yml index 448978eeef..7d439064c8 100644 --- a/roles/bodhi2/base/templates/configmap.yml +++ b/roles/bodhi2/base/templates/configmap.yml @@ -29,7 +29,7 @@ data: .fedoraproject.org = FEDORAPROJECT.ORG fedoraproject.org = FEDORAPROJECT.ORG {% if env == "staging" %} - .stg.phx2.fedoraproject.org = STG.FEDORAPROJECT.ORG + .stg.iad2.fedoraproject.org = STG.FEDORAPROJECT.ORG {% endif %} .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG stg.fedoraproject.org = STG.FEDORAPROJECT.ORG diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 76eca61a69..7c8d3b81da 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -698,9 +698,7 @@ debugtoolbar.hosts = 127.0.0.1 ::1 # suitable for a production environment. You can encode a username and password in the URL. For # example, postgresql://username:password@hostname/database_name # sqlalchemy.url = sqlite:////var/cache/bodhi.db -{% if env == 'production' and datacenter == 'phx2' %} -sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.phx2.fedoraproject.org/bodhi2 -{% elif env == 'production' and datacenter == 'iad2' %} +{% if env == 'production' %} sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.iad2.fedoraproject.org/bodhi2 {% elif env == 'staging' %} sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db01.stg.iad2.fedoraproject.org/bodhi2