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

replace some hardcoded phx2 items with hardcoded iad2 items for koji, pdc, and nagios

Browse source
This commit is contained in:
Stephen Smoogen 2020-06-10 07:25:38 -04:00
parent 885e935757
commit 1b487b34a0
5 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/inventory
View file

@ -762,8 +762,6 @@ bastion02.phx2.fedoraproject.org
certgetter01.iad2.fedoraproject.org certgetter01.iad2.fedoraproject.org
# download01.phx2.fedoraproject.org # download01.phx2.fedoraproject.org
log01.phx2.fedoraproject.org log01.phx2.fedoraproject.org
kojipkgs01.phx2.fedoraproject.org
kojipkgs02.phx2.fedoraproject.org
ns03.phx2.fedoraproject.org ns03.phx2.fedoraproject.org
ns04.phx2.fedoraproject.org ns04.phx2.fedoraproject.org
db-qa01.qa.fedoraproject.org db-qa01.qa.fedoraproject.org

2
roles/kojipkgs/files/squid.conf
View file

@ -35,7 +35,7 @@ acl SSL_ports port 443
acl Safe_ports port 80 # http acl Safe_ports port 80 # http
acl Safe_ports port 443 # https acl Safe_ports port 443 # https
acl CONNECT method CONNECT acl CONNECT method CONNECT
acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.phx2.fedoraproject.org kojipkgs02.phx2.fedoraproject.org acl our_sites dstdomain kojipkgs.fedoraproject.org kojipkgs01.fedoraproject.org kojipkgs02.fedoraproject.org kojipkgs01.iad2.fedoraproject.org kojipkgs02.iad2.fedoraproject.org
acl phx2 src 10.5.125.0/24 10.5.127.0/24 10.5.129.0/24 acl phx2 src 10.5.125.0/24 10.5.127.0/24 10.5.129.0/24
# The stg builders in the createrepo channel need access to repos # The stg builders in the createrepo channel need access to repos
acl phx2-stg src 10.5.128.84/32 10.5.128.85/32 10.5.128.86/32 10.5.128.87/32 10.5.128.69/32 acl phx2-stg src 10.5.128.84/32 10.5.128.85/32 10.5.128.86/32 10.5.128.87/32 10.5.128.69/32

2
roles/nagios_server/files/nagios/services/iad2_internal/locking.cfg
View file

@ -1,5 +1,5 @@
define service { define service {
host_name rawhide-composer.iad2.fedoraproject.org, koji01.phx2.fedoraproject.org host_name rawhide-composer.iad2.fedoraproject.org, koji01.iad2.fedoraproject.org
service_description Check NFS File Locks service_description Check NFS File Locks
check_command check_by_nrpe!check_lock check_command check_by_nrpe!check_lock
use criticaltemplate use criticaltemplate

6
roles/pdc/backend/templates/pdcupdater.py
View file

@ -16,10 +16,10 @@ config = {
# Credentials to talk to PDC # Credentials to talk to PDC
'pdcupdater.pdc': { 'pdcupdater.pdc': {
{% if env == 'staging' %} {% if env == 'staging' %}
'server': 'http://pdc-web01.stg.phx2.fedoraproject.org/rest_api/v1/', 'server': 'http://pdc-web01.stg.iad2.fedoraproject.org/rest_api/v1/',
'token': '{{pdc_updater_api_token_stg }}', 'token': '{{pdc_updater_api_token_stg }}',
{% else %} {% else %}
'server': 'http://pdc-web01.phx2.fedoraproject.org/rest_api/v1/', 'server': 'http://pdc-web01.iad2.fedoraproject.org/rest_api/v1/',
'token': '{{pdc_updater_api_token_prod }}', 'token': '{{pdc_updater_api_token_prod }}',
{% endif %} {% endif %}
}, },
@ -53,7 +53,7 @@ config = {
{% if env == 'staging' %} {% if env == 'staging' %}
'pdcupdater.koji_url': 'https://koji.stg.fedoraproject.org/kojihub', 'pdcupdater.koji_url': 'https://koji.stg.fedoraproject.org/kojihub',
{% else %} {% else %}
'pdcupdater.koji_url': 'http://koji01.phx2.fedoraproject.org/kojihub', 'pdcupdater.koji_url': 'http://koji01.iad2.fedoraproject.org/kojihub',
{% endif %} {% endif %}
# Use 8 threads to talk to koji in parallel. # Use 8 threads to talk to koji in parallel.
'pdcupdater.koji_io_threads': 8, 'pdcupdater.koji_io_threads': 8,

6
roles/varnish/templates/s390kojipkgs.vcl.j2
View file

@ -16,7 +16,7 @@ acl purge {
{% if env == 'staging' %} {% if env == 'staging' %}
backend koji01 { backend koji01 {
.host = "koji01.stg.phx2.fedoraproject.org"; .host = "koji01.stg.iad2.fedoraproject.org";
.probe = { .probe = {
.url = "/work/"; .url = "/work/";
.timeout = 3600s; .timeout = 3600s;
@ -30,7 +30,7 @@ backend koji01 {
} }
{% else %} {% else %}
backend kojipkgs01 { backend kojipkgs01 {
.host = "kojipkgs01.phx2.fedoraproject.org"; .host = "kojipkgs01.iad2.fedoraproject.org";
.probe = { .probe = {
.url = "/"; .url = "/";
.timeout = 3600s; .timeout = 3600s;
@ -44,7 +44,7 @@ backend kojipkgs01 {
} }
backend kojipkgs02 { backend kojipkgs02 {
.host = "kojipkgs02.phx2.fedoraproject.org"; .host = "kojipkgs02.iad2.fedoraproject.org";
.probe = { .probe = {
.url = "/"; .url = "/";
.timeout = 3600s; .timeout = 3600s;