clean up download usage
This commit is contained in:
Stephen Smoogen
parent
518d72347c
commit
d89168a30f
6 changed files with 44 additions and 46 deletions
14
inventory/group_vars/download_iad2
Normal file
14
inventory/group_vars/download_iad2
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
datacenter: iad2
|
||||
tcp_ports: [80, 443, 873]
|
||||
rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"
|
||||
nrpe_procs_warn: 900
|
||||
nrpe_procs_crit: 1000
|
||||
dns: 10.3.163.33
|
||||
|
||||
host_group: download-iad2
|
||||
|
||||
# nfs mount options, overrides the all/default
|
||||
nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"
|
||||
|
||||
blocked_ips: [ ]
|
||||
|
|
@ -269,13 +269,6 @@ os-node02.stg.phx2.fedoraproject.org
|
|||
os-node03.stg.phx2.fedoraproject.org
|
||||
os-node04.stg.phx2.fedoraproject.org
|
||||
|
||||
[download_phx2]
|
||||
download01.phx2.fedoraproject.org
|
||||
download02.phx2.fedoraproject.org
|
||||
download03.phx2.fedoraproject.org
|
||||
download04.phx2.fedoraproject.org
|
||||
download05.phx2.fedoraproject.org
|
||||
|
||||
[download_iad2]
|
||||
dl01.iad2.fedoraproject.org
|
||||
dl02.iad2.fedoraproject.org
|
||||
|
|
@ -293,11 +286,10 @@ download-rdu01.fedoraproject.org
|
|||
download-cc-rdu01.fedoraproject.org
|
||||
|
||||
[download_tier1]
|
||||
download04.phx2.fedoraproject.org
|
||||
download05.phx2.fedoraproject.org
|
||||
dl04.iad2.fedoraproject.org
|
||||
d05.iad2.fedoraproject.org
|
||||
|
||||
[download:children]
|
||||
download_phx2
|
||||
download_ibiblio
|
||||
download_rdu2
|
||||
download_cc_rdu
|
||||
|
|
@ -786,7 +778,7 @@ bastion01.phx2.fedoraproject.org
|
|||
bastion02.phx2.fedoraproject.org
|
||||
certgetter01.phx2.fedoraproject.org
|
||||
certgetter01.iad2.fedoraproject.org
|
||||
download01.phx2.fedoraproject.org
|
||||
# download01.phx2.fedoraproject.org
|
||||
log01.phx2.fedoraproject.org
|
||||
kojipkgs01.phx2.fedoraproject.org
|
||||
kojipkgs02.phx2.fedoraproject.org
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download_ibiblio:download_cc_rdu:download_phx2:download_iad2"
|
||||
- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download_ibiblio:download_cc_rdu:download_iad2"
|
||||
|
||||
- name: Download servers
|
||||
hosts: download
|
||||
|
|
|
|||
|
|
@ -65,11 +65,11 @@ syncHttpLogs value01.phx2.fedoraproject.org
|
|||
syncHttpLogs secondary01
|
||||
syncHttpLogs people02.vpn.fedoraproject.org
|
||||
syncHttpLogs noc01.phx2.fedoraproject.org
|
||||
syncHttpLogs download01.phx2.fedoraproject.org
|
||||
syncHttpLogs download02.phx2.fedoraproject.org
|
||||
syncHttpLogs download03.phx2.fedoraproject.org
|
||||
syncHttpLogs download04.phx2.fedoraproject.org
|
||||
syncHttpLogs download05.phx2.fedoraproject.org
|
||||
syncHttpLogs dl01.iad2.fedoraproject.org
|
||||
syncHttpLogs dl02.iad2.fedoraproject.org
|
||||
syncHttpLogs dl03.iad2.fedoraproject.org
|
||||
syncHttpLogs dl04.iad2.fedoraproject.org
|
||||
syncHttpLogs dl05.iad2.fedoraproject.org
|
||||
syncHttpLogs download-rdu01.vpn.fedoraproject.org
|
||||
syncHttpLogs download-ib01.vpn.fedoraproject.org
|
||||
syncHttpLogs download-cc-rdu01.vpn.fedoraproject.org
|
||||
|
|
|
|||
|
|
@ -234,30 +234,26 @@ container.source_registry = candidate-registry.stg.fedoraproject.org
|
|||
# version and the second will be replaced with the architecture.
|
||||
# If a version of the option exists with a matching version, it has priority over one without.
|
||||
# examples (these settings do not have defaults):
|
||||
# fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_28_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
# fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
{% if env == 'production' %}
|
||||
fedora_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
# Fedora 28 changed the repo layout, so the next two lines are overrides until Fedora 27 goes EOL (and then they can be dropped).
|
||||
fedora_27_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/%%s/repodata/repomd.xml
|
||||
fedora_27_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_8_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_epel_8_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_epel_modular_8_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_epel_modular_8_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_modular_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_modular_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_epel_8_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_epel_8_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_epel_modular_8_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_epel_modular_8_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_modular_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Modular/%%s/repodata/repomd.xml
|
||||
fedora_modular_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Modular/%%s/repodata/repomd.xml
|
||||
{% elif env == 'staging' %}
|
||||
fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
fedora_epel_stable_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_testing_master_repomd = http://download01.phx2.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
|
||||
fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_modular_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
{% endif %}
|
||||
|
|
@ -272,15 +268,11 @@ fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/co
|
|||
# be replaced with the architecture.
|
||||
# If a version of the option exists with a matching version, it has priority over one without.
|
||||
# examples (these settings do not have defaults):
|
||||
# fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_28_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
# fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_stable_alt_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora-secondary/updates/%%s/%%s/repodata/repomd.xml
|
||||
# fedora_testing_alt_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
{% if env == 'production' %}
|
||||
fedora_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
# Fedora 28 changed the repo layout, so the next two lines are overrides until Fedora 27 goes EOL (and then they can be dropped).
|
||||
fedora_27_stable_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/%%s/%%s/repodata/repomd.xml
|
||||
fedora_27_testing_alt_master_repomd = http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/%%s/repodata/repomd.xml
|
||||
fedora_stable_alt_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora-secondary/updates/%%s/Everything/%%s/repodata/repomd.xml
|
||||
fedora_testing_alt_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora-secondary/updates/testing/%%s/Everything/%%s/repodata/repomd.xml
|
||||
{% elif env == 'staging' %}
|
||||
fedora_stable_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
fedora_testing_alt_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ fedoracommunity.connector.kojihub.baseurl = https://koji{{env_suffix}}.fedorapro
|
|||
fedoracommunity.connector.bodhi.baseurl = https://bodhi{{env_suffix}}.fedoraproject.org/
|
||||
fedoracommunity.connector.mdapi.baseurl = https://apps{{env_suffix}}.fedoraproject.org/mdapi
|
||||
fedoracommunity.connector.fas.baseurl = https://admin{{env_suffix}}.fedoraproject.org/accounts/
|
||||
fedoracommunity.connector.icons.baseurl = http://download01.phx2.fedoraproject.org/pub/alt/screenshots
|
||||
fedoracommunity.connector.icons.baseurl = http://dl-iad05.fedoraproject.org/pub/alt/screenshots
|
||||
{% if env == "staging" %}
|
||||
fedoracommunity.connector.bugzilla.baseurl = https://partner-bugzilla.redhat.com/xmlrpc.cgi
|
||||
{% else %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue