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

Fix staging oci-registry to point to 01 only since we don't have a 02 anymore.

Browse source 
This commit should make no changes to production and thus shouldn't need a freeze break.
This commit is contained in:
Kevin Fenzi 2018-10-11 22:07:33 +00:00
parent 48c1accc0c
commit d57f891ade
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,7 +351,9 @@ frontend oci-registry-frontend
backend oci-registry-backend backend oci-registry-backend
balance hdr(appserver) balance hdr(appserver)
server oci-registry01 oci-registry01:5000 check inter 10s rise 1 fall 2 server oci-registry01 oci-registry01:5000 check inter 10s rise 1 fall 2
{% if env == "production" %}
server oci-registry02 oci-registry02:5000 check inter 10s rise 1 fall 2 server oci-registry02 oci-registry02:5000 check inter 10s rise 1 fall 2
{% endif %}
{% if env == "staging" %} {% if env == "staging" %}

4
roles/httpd/reverseproxy/templates/reversepassproxy.registry-generic.conf
View file

@ -12,7 +12,11 @@ RewriteRule ^/v2/(.*)/blobs/([a-zA-Z0-9:]*) https://cdn.registry.fedoraproject.o
# This is terible, but Docker. # This is terible, but Docker.
RewriteCond %{REQUEST_METHOD} ^(PATCH|POST|PUT|DELETE)$ RewriteCond %{REQUEST_METHOD} ^(PATCH|POST|PUT|DELETE)$
{% if env == "production" %}
RewriteRule ^/v2/(.*)$ http://oci-registry02:5000/v2/$1 [P,L] RewriteRule ^/v2/(.*)$ http://oci-registry02:5000/v2/$1 [P,L]
{% elif env == "staging" %}
RewriteRule ^/v2/(.*)$ http://oci-registry01:5000/v2/$1 [P,L]
{% endif %}
RewriteRule ^/v2/(.*)$ http://localhost:6081/v2/$1 [P,L] RewriteRule ^/v2/(.*)$ http://localhost:6081/v2/$1 [P,L]
DocumentRoot /srv/web/registry-index/ DocumentRoot /srv/web/registry-index/