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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2017-01-09 16:13:36 +00:00
commit 54edf794ee
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/hardware
View file

@ -67,8 +67,6 @@ bvirthost10.phx2.fedoraproject.org
bvirthost11.phx2.fedoraproject.org bvirthost11.phx2.fedoraproject.org
[ibms] [ibms]
autocloud-backend-libvirt.phx2.fedoraproject.org
autocloud-backend-vbox.phx2.fedoraproject.org
virthost12.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org
ibiblio02.fedoraproject.org ibiblio02.fedoraproject.org
ibiblio03.fedoraproject.org ibiblio03.fedoraproject.org

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

@ -138,6 +138,13 @@
website: paste.fedoraproject.org website: paste.fedoraproject.org
destname: sticky-notes destname: sticky-notes
proxyurl: "{{ varnish_url }}" 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 - role: httpd/reverseproxy
website: admin.fedoraproject.org website: admin.fedoraproject.org
@ -569,12 +576,6 @@
proxyurl: http://localhost:10052 proxyurl: http://localhost:10052
when: env == "staging" when: env == "staging"
- role: httpd/reverseproxy
website: modernpaste.fedoraproject.org
destname: modernpaste
proxyurl: http://localhost:10055
when: env == "staging"
- role: httpd/reverseproxy - role: httpd/reverseproxy
website: koji.fedoraproject.org website: koji.fedoraproject.org
destname: koji destname: koji

8
roles/copr/backend/files/provision/provision_builder_tasks.yml
View file

@ -71,10 +71,6 @@
regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=updates-released-f\$releasever&arch=\$basearch' 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/' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/'
with_items: #mock_fedora_configs_to_patch.stdout_lines 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-i386.cfg
- /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-24-x86_64.cfg
- /etc/mock/fedora-25-i386.cfg - /etc/mock/fedora-25-i386.cfg
@ -86,10 +82,6 @@
regexp='^metalink=https://mirrors.fedoraproject.org/metalink\?repo=fedora-f\$releasever&arch=\$basearch' 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/' replace='baseurl=http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/'
with_items: #mock_fedora_configs_to_patch.stdout_lines 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-i386.cfg
- /etc/mock/fedora-24-x86_64.cfg - /etc/mock/fedora-24-x86_64.cfg
- /etc/mock/fedora-25-i386.cfg - /etc/mock/fedora-25-i386.cfg

8
roles/robosignatory/files/robosignatory.production.py
View file

@ -26,6 +26,14 @@ config = {
'keytab': '/etc/krb5.autosign_autosign01.phx2.fedoraproject.org.keytab' 'keytab': '/etc/krb5.autosign_autosign01.phx2.fedoraproject.org.keytab'
}, },
'tags': [ 'tags': [
# Temporary tags for rebuilds
{
"from": "f26-ruby24",
"to": "f26-ruby24",
"key": "fedora-26",
"keyid": "64dab85d"
},
# Normal tags
{ {
"from": "epel6-infra-candidate", "from": "epel6-infra-candidate",
"to": "epel6-infra", "to": "epel6-infra",