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

Move to registry02/03 in production

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2017-08-04 00:22:01 +02:00
parent 92f0580724
commit 5bd010cc68
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -296,11 +296,15 @@ listen osbs 0.0.0.0:10047
balance hdr(appserver) balance hdr(appserver)
server osbs-master01 osbs-master01:8443 check inter 10s rise 1 fall 2 check ssl verify none server osbs-master01 osbs-master01:8443 check inter 10s rise 1 fall 2 check ssl verify none
# This is silly, but basically, stg has registry01/02, prod has registry02/03
listen docker-registry 0.0.0.0:10048 listen docker-registry 0.0.0.0:10048
balance hdr(appserver) balance hdr(appserver)
server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2
{% if env == "staging" %} {% if env == "staging" %}
server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2
{% endif %}
server docker-registry02 docker-registry02:5000 check inter 10s rise 1 fall 2 server docker-registry02 docker-registry02:5000 check inter 10s rise 1 fall 2
{% if env == "production" %}
server docker-registry03 docker-registry03:5000 check inter 10s rise 1 fall 2
{% endif %} {% endif %}
{% if env == "staging" %} {% if env == "staging" %}

7
roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf
View file

@ -14,8 +14,7 @@ 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 == "staging" %} RewriteRule ^/v2/(.*)$ http://docker-registry02:5000/v2/$1 [P,L]
RewriteRule ^/v2/(.*)$ http://docker-registry01:5000/v2/$1 [P,L]
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/
@ -23,10 +22,6 @@ DocumentRoot /srv/web/registry-index/
<Directory /srv/web/registry-index> <Directory /srv/web/registry-index>
Require all granted Require all granted
</Directory> </Directory>
{% else %}
RewriteRule ^/(.*)$ http://localhost:10048/$1 [P,L]
RewriteRule ^/(.*)$ http://localhost:6081/$1 [P,L]
{% endif %}
SSLVerifyClient optional SSLVerifyClient optional
SSLVerifyDepth 1 SSLVerifyDepth 1