infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

copr: change copr-fe-dev.cloud.fedoraproject.org to copr.stg.fedorainfracloud.org

Browse source 
Also change copr-fe-dev.aws.fedoraproject.org to
copr.stg.fedoraproject.org. It is needed because of setup in kerberos
config files placed in the fedora-packager-kerberos which takes
stg.fedoraproject.org as staging instance, not aws.fedoraproject.org
This commit is contained in:
Silvie Chlupova 2022-02-10 14:49:56 +01:00
parent 48d5523dc5
commit 2eab0c9987
13 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/cloud
View file

@ -26,7 +26,7 @@ copr-be-dev.aws.fedoraproject.org
copr-dist-git.aws.fedoraproject.org
copr-dist-git-dev.aws.fedoraproject.org
copr-fe.aws.fedoraproject.org
copr-fe-dev.aws.fedoraproject.org
copr.stg.fedoraproject.org
copr-db-stg.aws.fedoraproject.org
copr-keygen.aws.fedoraproject.org
copr-keygen-dev.aws.fedoraproject.org

2
inventory/group_vars/copr_back_dev
View file

@ -23,7 +23,7 @@ csi_relationship: This host is the testing environment for the cloud infrastruct
# See http://infrastructure.fedoraproject.org/csi/security-policy/
csi_security_category: Moderate
do_sign: "true"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
frontend_base_url: "https://copr.stg.fedorainfracloud.org"
# consumed by roles/copr/certbot
letsencrypt:
certificates:

2
inventory/group_vars/copr_back_dev_aws
View file

@ -23,7 +23,7 @@ csi_security_category: Moderate
datacenter: aws
description: copr dispatcher and repo server - dev instance
do_sign: "true"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
frontend_base_url: "https://copr.stg.fedorainfracloud.org"
# consumed by roles/copr/certbot
letsencrypt:
certificates:

2
inventory/group_vars/copr_dev
View file

@ -15,7 +15,7 @@ copr_aws_region: us-east-1
copr_backend_ips: ["172.25.33.80", "172.25.144.254"]
devel: true
dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
frontend_base_url: "https://copr.stg.fedorainfracloud.org"
keygen_host: "172.25.33.73"
postfix_maincf: "postfix/main.cf/main.cf.copr"
resolvconf: "resolv.conf/cloud"

2
inventory/group_vars/copr_dev_aws
View file

@ -62,7 +62,7 @@ copr_messaging: true
datacenter: aws
devel: true
dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
frontend_base_url: "https://copr.stg.fedorainfracloud.org"
keygen_host: "54.225.23.248"
postfix_group: copr
rpm_vendor_copr_name: Fedora Copr (devel)

6
inventory/group_vars/copr_front_dev_aws
View file

@ -5,7 +5,7 @@ allowlist_emails:
- jkadlcik@redhat.com
- schlupov@redhat.com
copr_fe_homedir: /usr/share/copr/coprs_frontend
copr_frontend_public_hostname: "copr-fe-dev.cloud.fedoraproject.org"
copr_frontend_public_hostname: "copr.stg.fedorainfracloud.org"
copr_kerberos_auth_enabled: false
copr_mbs_cli_login: Y29wcg==##vtvvikhcjncwkfkdcssv
copr_messaging_queue: "c8e11df7-e863-4ca4-99b9-d37c6663c7f7"
@ -20,10 +20,10 @@ csi_security_category: Low
# consumed by roles/copr/certbot
letsencrypt:
certificates:
copr-fe-dev.cloud.fedoraproject.org:
copr.stg.fedorainfracloud.org:
challenge_dir: /var/www/html
domains:
- copr-fe-dev.cloud.fedoraproject.org
- copr.stg.fedorainfracloud.org
mail: copr-devel@lists.fedorahosted.org
predefined_deploy_script: httpd
tcp_ports: [22, 80, 443,

4
inventory/host_vars/copr-fe-dev.aws.fedoraproject.org
View file

@ -4,7 +4,7 @@ copr_hostbase: copr-fe-dev
datacenter: aws
description: copr frontend - dev instance
hostbase: copr-fe-dev-
inventory_hostname: "copr-fe-dev.aws.fedoraproject.org"
inventory_hostname: "copr.stg.fedoraproject.org"
inventory_instance_name: copr-fe-dev
nagios_Check_Services:
dhcpd: false
@ -16,7 +16,7 @@ nagios_Check_Services:
raid: false
sshd: false
swap: false
principal_alias: "HTTP/copr-fe-dev.cloud.fedoraproject.org@STG.FEDORAPROJECT.ORG"
principal_alias: "HTTP/copr.stg.fedorainfracloud.org@STG.FEDORAPROJECT.ORG"
public_ip: 18.208.24.211
root_auth_users: msuchy frostyx praiskup schlupov ttomecek
swap_file_path: /swap

4
inventory/inventory
View file

@ -645,7 +645,7 @@ copr-be-dev.aws.fedoraproject.org
#copr-be-dev-temp.aws.fedoraproject.org
copr-db-stg.aws.fedoraproject.org
copr-dist-git-dev.aws.fedoraproject.org
copr-fe-dev.aws.fedoraproject.org
copr.stg.fedoraproject.org
copr-keygen-dev.aws.fedoraproject.org
db-datanommer01.stg.iad2.fedoraproject.org
db-fas01.stg.iad2.fedoraproject.org
@ -955,7 +955,7 @@ copr-dist-git.aws.fedoraproject.org
[copr_front_dev_aws]
# stg machine in AWS
copr-fe-dev.aws.fedoraproject.org
copr.stg.fedoraproject.org
[copr_back_dev_aws]
copr-be-dev.aws.fedoraproject.org

2
roles/copr/backend/templates/cleanup-unused-vms-from-redis
View file

@ -7,7 +7,7 @@
prefix=copr:backend:vm_instance:hset::
{% if devel %}
hostname=copr-fe-dev.cloud.fedoraproject.org
hostname=copr.stg.fedorainfracloud.org
{% else %}
hostname=copr.fedoraproject.org
{% endif %}

2
roles/copr/frontend/templates/copr.conf
View file

@ -82,7 +82,7 @@ INTRANET_IPS = {{ copr_backend_ips }}
REPO_GPGCHECK = {% if devel %} 0 {% else %} 1 {% endif %}
{% if env == 'staging' %}
PUBLIC_COPR_BASE_URL = "https://copr-fe-dev.cloud.fedoraproject.org"
PUBLIC_COPR_BASE_URL = "https://copr.stg.fedorainfracloud.org"
{% else %}
PUBLIC_COPR_BASE_URL = "https://copr.fedorainfracloud.org"
{% endif %}

2
roles/copr/frontend/templates/sysconfig/certbot
View file

@ -48,7 +48,7 @@ RENEW_HOOK=""
# The following command is produced
# certbot renew **CERTBOT_ARGS
{% if devel %}
CERTBOT_ARGS="--webroot -w /srv/web/acme-challenge --cert-name copr-fe-dev.cloud.fedoraproject.org"
CERTBOT_ARGS="--webroot -w /srv/web/acme-challenge --cert-name copr.stg.fedorainfracloud.org"
{% else %}
CERTBOT_ARGS=""
{% endif %}

2
roles/opendkim/files/SigningTable
View file

@ -17,7 +17,7 @@
*@stg.fedoraproject.org bastion-iad._domainkey.fedoraproject.org
*@aws.fedoraproject.org bastion-iad._domainkey.fedoraproject.org
*@copr-fe.aws.fedoraproject.org bastion._domainkey.fedoraproject.org
*@copr-fe-dev.aws.fedoraproject.org bastion._domainkey.fedoraproject.org
*@copr.stg.fedoraproject.org bastion._domainkey.fedoraproject.org
*@fedorahosted.org bastion-iad._domainkey.fedoraproject.org
*@lists.fedorahosted.org bastion-iad._domainkey.fedoraproject.org
pagure@pkgs.fedoraproject.org bastion-iad._domainkey.fedoraproject.org

2
roles/openshift-apps/koschei/vars/staging.yml
View file

@ -12,7 +12,7 @@ koschei_pgsql_hostname: db01.stg.iad2.fedoraproject.org
koschei_koji_hub: koji.stg.fedoraproject.org
koschei_kojipkgs: koji.stg.fedoraproject.org
koschei_koji_web: koji.stg.fedoraproject.org
koschei_copr_url: http://copr-fe-dev.cloud.fedoraproject.org
koschei_copr_url: https://copr.stg.fedorainfracloud.org
koschei_copr_login: "{{ koschei_copr_login_stg }}"
koschei_copr_token: "{{ koschei_copr_token_stg }}"
koschei_oidc_provider: id.stg.fedoraproject.org