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

Enable odcs prod nodes.

Browse source
This commit is contained in:
Ralph Bean 2017-10-13 14:45:10 +00:00
parent aed0778c44
commit 2adfc5a305
4 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
inventory/inventory
View file

@ -593,17 +593,13 @@ ns04.phx2.fedoraproject.org
ns05.fedoraproject.org ns05.fedoraproject.org
[odcs-frontend] [odcs-frontend]
# not prod yet, until patrick finishes his audit. odcs-frontend01.phx2.fedoraproject.org
# https://pagure.io/fedora-infrastructure/issue/6182
#odcs-frontend01.phx2.fedoraproject.org
[odcs-frontend-stg] [odcs-frontend-stg]
odcs-frontend01.stg.phx2.fedoraproject.org odcs-frontend01.stg.phx2.fedoraproject.org
[odcs-backend] [odcs-backend]
# not prod yet, until patrick finishes his audit. odcs-backend01.phx2.fedoraproject.org
# https://pagure.io/fedora-infrastructure/issue/6182
#odcs-backend01.phx2.fedoraproject.org
[odcs-backend-stg] [odcs-backend-stg]
odcs-backend01.stg.phx2.fedoraproject.org odcs-backend01.stg.phx2.fedoraproject.org
@ -613,10 +609,8 @@ odcs-frontend-stg
odcs-backend-stg odcs-backend-stg
[odcs:children] [odcs:children]
# not prod yet, until patrick finishes his audit. odcs-frontend
# https://pagure.io/fedora-infrastructure/issue/6182 odcs-backend
#odcs-frontend
#odcs-backend
[openqa] [openqa]
openqa01.qa.fedoraproject.org openqa01.qa.fedoraproject.org

1
playbooks/include/proxies-reverseproxy.yml
View file

@ -622,7 +622,6 @@
proxyurl: http://localhost:10066 proxyurl: http://localhost:10066
tags: tags:
- odcs - odcs
when: env == "staging"
- role: httpd/reverseproxy - role: httpd/reverseproxy
website: data-analysis.fedoraproject.org website: data-analysis.fedoraproject.org

1
playbooks/include/proxies-websites.yml
View file

@ -791,7 +791,6 @@
sslonly: true sslonly: true
server_aliases: [odcs.stg.fedoraproject.org] server_aliases: [odcs.stg.fedoraproject.org]
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
when: env == "staging"
# fedorahosted is retired. We have the site here so we can redirect it. # fedorahosted is retired. We have the site here so we can redirect it.

3
roles/haproxy/templates/haproxy.cfg
View file

@ -649,7 +649,6 @@ backend os-nodes-backend
option httpchk GET / option httpchk GET /
http-check expect status 503 http-check expect status 503
{% if env == "staging" %}
frontend odcs-frontend frontend odcs-frontend
bind 0.0.0.0:10066 bind 0.0.0.0:10066
default_backend odcs-backend default_backend odcs-backend
@ -658,7 +657,7 @@ backend odcs-backend
balance hdr(appserver) balance hdr(appserver)
server odcs-frontend01 odcs-frontend01:80 check inter 20s rise 2 fall 3 server odcs-frontend01 odcs-frontend01:80 check inter 20s rise 2 fall 3
option httpchk GET /api/1/composes/ option httpchk GET /api/1/composes/
{% endif %}
# Apache doesn't handle the initial connection here like the other proxy # Apache doesn't handle the initial connection here like the other proxy
# entries. This proxy also doesn't use the http mode like the others. # entries. This proxy also doesn't use the http mode like the others.
# stunnel should be sitting on port 9939 (public) and redirecting # stunnel should be sitting on port 9939 (public) and redirecting