diff --git a/inventory/hardware b/inventory/hardware index 0cee09a396..62fd8b767c 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -67,8 +67,6 @@ bvirthost10.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org [ibms] -autocloud-backend-libvirt.phx2.fedoraproject.org -autocloud-backend-vbox.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org ibiblio02.fedoraproject.org ibiblio03.fedoraproject.org diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index a368d5e6ca..c03375d4dd 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -138,6 +138,13 @@ website: paste.fedoraproject.org destname: sticky-notes proxyurl: "{{ varnish_url }}" + when: env != "staging" + + - role: httpd/reverseproxy + website: paste.fedoraproject.org + destname: modernpaste + proxyurl: http://localhost:10055 + when: env == "staging" - role: httpd/reverseproxy website: admin.fedoraproject.org @@ -569,12 +576,6 @@ proxyurl: http://localhost:10052 when: env == "staging" - - role: httpd/reverseproxy - website: modernpaste.fedoraproject.org - destname: modernpaste - proxyurl: http://localhost:10055 - when: env == "staging" - - role: httpd/reverseproxy website: koji.fedoraproject.org destname: koji diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml index 681ce3e87c..7cf0b7f9f3 100644 --- a/roles/copr/backend/files/provision/provision_builder_tasks.yml +++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml @@ -71,10 +71,6 @@ regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=updates-released-f\$releasever&arch=\$basearch' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/' with_items: #mock_fedora_configs_to_patch.stdout_lines - - /etc/mock/fedora-22-i386.cfg - - /etc/mock/fedora-22-x86_64.cfg - - /etc/mock/fedora-23-i386.cfg - - /etc/mock/fedora-23-x86_64.cfg - /etc/mock/fedora-24-i386.cfg - /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-25-i386.cfg @@ -86,10 +82,6 @@ regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=fedora-f\$releasever&arch=\$basearch' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/' with_items: #mock_fedora_configs_to_patch.stdout_lines - - /etc/mock/fedora-22-i386.cfg - - /etc/mock/fedora-22-x86_64.cfg - - /etc/mock/fedora-23-i386.cfg - - /etc/mock/fedora-23-x86_64.cfg - /etc/mock/fedora-24-i386.cfg - /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-25-i386.cfg diff --git a/roles/robosignatory/files/robosignatory.production.py b/roles/robosignatory/files/robosignatory.production.py index 90bd342003..b5dae03a6b 100644 --- a/roles/robosignatory/files/robosignatory.production.py +++ b/roles/robosignatory/files/robosignatory.production.py @@ -26,6 +26,14 @@ config = { 'keytab': '/etc/krb5.autosign_autosign01.phx2.fedoraproject.org.keytab' }, 'tags': [ + # Temporary tags for rebuilds + { + "from": "f26-ruby24", + "to": "f26-ruby24", + "key": "fedora-26", + "keyid": "64dab85d" + }, + # Normal tags { "from": "epel6-infra-candidate", "to": "epel6-infra",