From 86b83c3e2b28042a4df2860c3bb64498b452ab98 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 12 Jul 2016 15:22:05 +0000 Subject: [PATCH] Enable registry.fp.o prod Signed-off-by: Patrick Uiterwijk --- playbooks/include/proxies-fedora-web.yml | 1 - playbooks/include/proxies-reverseproxy.yml | 1 - playbooks/include/proxies-websites.yml | 1 - roles/haproxy/templates/haproxy.cfg | 2 -- 4 files changed, 5 deletions(-) diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index de04ede249..50ace556d6 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -43,7 +43,6 @@ website: budget.fedoraproject.org - role: fedora-web/registry website: registry.fedoraproject.org - when: env == "staging" - role: fedora-web/codecs website: codecs.fedoraproject.org - role: fedora-web/alt diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 00c5be379d..0b57f99c7d 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -493,7 +493,6 @@ website: registry.fedoraproject.org destname: registry proxyurl: http://localhost:10048 - when: env == "staging" - role: httpd/reverseproxy website: retrace.fedoraproject.org diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index fb2e5cbd33..0ef051253d 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -497,7 +497,6 @@ server_aliases: [registry.stg.fedoraproject.org] sslonly: true cert_name: "{{wildcard_cert_name}}" - when: env == "staging" - role: httpd/website name: retrace.fedoraproject.org diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 3cbab6266c..e0c76a3fff 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -294,11 +294,9 @@ listen osbs 0.0.0.0:10047 server osbs-master01 osbs-master01:8443 check inter 10s rise 1 fall 2 check ssl verify none {% endif %} -{% if env == "staging" %} listen docker-registry 0.0.0.0:10048 balance hdr(appserver) server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2 -{% endif %} {% if env == "staging" %} listen retrace 0.0.0.0:10049