From 2667ac065f76a9bad390f0ead3664c903794ce99 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sun, 4 Dec 2022 15:01:27 +0100 Subject: [PATCH] inventory/copr: drop unused hosts/vars The non-aws variant is not used for a looong time. It just confuses contributors now. The stg is not used either. --- inventory/group_vars/copr | 21 ------------------- inventory/group_vars/copr_back | 24 --------------------- inventory/group_vars/copr_back_dev | 29 -------------------------- inventory/group_vars/copr_back_stg | 20 ------------------ inventory/group_vars/copr_dev | 22 ------------------- inventory/group_vars/copr_dist_git | 13 ------------ inventory/group_vars/copr_dist_git_dev | 14 ------------- inventory/group_vars/copr_dist_git_stg | 5 ----- inventory/group_vars/copr_hypervisor | 26 ----------------------- inventory/group_vars/copr_keygen | 6 ------ inventory/group_vars/copr_keygen_dev | 7 ------- inventory/group_vars/copr_keygen_stg | 8 ------- inventory/group_vars/copr_stg | 9 -------- playbooks/groups/copr-backend.yml | 6 +++--- playbooks/groups/copr-dist-git.yml | 6 +++--- playbooks/groups/copr-keygen.yml | 6 +++--- 16 files changed, 9 insertions(+), 213 deletions(-) delete mode 100644 inventory/group_vars/copr delete mode 100644 inventory/group_vars/copr_back delete mode 100644 inventory/group_vars/copr_back_dev delete mode 100644 inventory/group_vars/copr_back_stg delete mode 100644 inventory/group_vars/copr_dev delete mode 100644 inventory/group_vars/copr_dist_git delete mode 100644 inventory/group_vars/copr_dist_git_dev delete mode 100644 inventory/group_vars/copr_dist_git_stg delete mode 100644 inventory/group_vars/copr_hypervisor delete mode 100644 inventory/group_vars/copr_keygen delete mode 100644 inventory/group_vars/copr_keygen_dev delete mode 100644 inventory/group_vars/copr_keygen_stg delete mode 100644 inventory/group_vars/copr_stg diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr deleted file mode 100644 index 6895bf046e..0000000000 --- a/inventory/group_vars/copr +++ /dev/null @@ -1,21 +0,0 @@ ---- -_forward_src: "forward" -backend_base_url: "https://download.copr.fedorainfracloud.org" -builders: - # max|max_spawn|max_prealloc - aws: - aarch64: [20, 10, 10] - armhfp: [20, 5, 5] - x86_64: [100, 20, 30] -copr_aws_region: us-east-1 -# don't forget to update ip in ./copr-keygen, due to custom firewall rules - -# eth0, eth1 -copr_backend_ips: ["172.25.33.79", "172.25.82.25"] -datacenter: cloud -devel: false -dist_git_base_url: "copr-dist-git.fedorainfracloud.org" -frontend_base_url: "https://copr.fedorainfracloud.org" -keygen_host: "172.25.33.75" -postfix_maincf: "postfix/main.cf/main.cf.copr" -resolvconf: "resolv.conf/cloud" diff --git a/inventory/group_vars/copr_back b/inventory/group_vars/copr_back deleted file mode 100644 index d1cee58f2b..0000000000 --- a/inventory/group_vars/copr_back +++ /dev/null @@ -1,24 +0,0 @@ ---- -# copr_builder_image_name: "Fedora-Cloud-Base-20141203-21" -copr_builder_flavor_name: "ms2.builder" -copr_builder_key_name: "buildsys" -copr_builder_network_name: "copr-net" -copr_builder_security_groups: "ssh-anywhere-copr,default,ssh-from-persistent-copr" -copr_nova_auth_url: "https://fedorainfracloud.org:5000/v2.0" -copr_nova_tenant_id: "5d99f099b7fe4b0387f0352f6301ba6a" -copr_nova_tenant_name: "copr" -copr_nova_username: "copr" -csi_primary_contact: "msuchy (mirek), frostyx, praiskup IRC #fedora-admin, #fedora-buildsys" -csi_purpose: Provide the backend for copr (3rd party packages) -csi_relationship: | - - Backend: Management of copr cloud infrastructure (OpenStack). - - Small frontend with copr's public stats -# These variables are pushed into /etc/system_identification by the base role. -# Groups and individual hosts should override them with specific info. -# See http://infrastructure.fedoraproject.org/csi/security-policy/ -csi_security_category: High -do_sign: "true" -frontend_base_url: "https://copr.fedorainfracloud.org" -nrpe_procs_crit: 2500 -nrpe_procs_warn: 2200 -spawn_in_advance: "true" diff --git a/inventory/group_vars/copr_back_dev b/inventory/group_vars/copr_back_dev deleted file mode 100644 index 5fdfdd751f..0000000000 --- a/inventory/group_vars/copr_back_dev +++ /dev/null @@ -1,29 +0,0 @@ ---- -copr_builder_flavor_name: "ms2.builder" -copr_builder_image_name: "builder-f24" -copr_builder_key_name: "buildsys" -copr_builder_network_name: "coprdev-net" -copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev" -copr_nova_auth_url: "https://fedorainfracloud.org:5000/v2.0" -copr_nova_tenant_id: "a6ff2158641c439a8426d7facab45437" -copr_nova_tenant_name: "coprdev" -copr_nova_username: "copr" -csi_primary_contact: "msuchy (mirek), frostyx, praiskup IRC #fedora-admin, #fedora-buildsys" -csi_purpose: Provide the testing environment of copr's backend -csi_relationship: This host is the testing environment for the cloud infrastructure of copr's backend -# These variables are pushed into /etc/system_identification by the base role. -# Groups and individual hosts should override them with specific info. -# See http://infrastructure.fedoraproject.org/csi/security-policy/ -csi_security_category: Moderate -do_sign: "true" -frontend_base_url: "https://copr.stg.fedoraproject.org" -# consumed by roles/copr/certbot -letsencrypt: - certificates: - copr-be-dev.cloud.fedoraproject.org: - challenge_dir: /var/lib/copr/public_html - domains: - - copr-be-dev.cloud.fedoraproject.org - mail: copr-devel@lists.fedorahosted.org - predefined_deploy_script: lighttpd -spawn_in_advance: "false" diff --git a/inventory/group_vars/copr_back_stg b/inventory/group_vars/copr_back_stg deleted file mode 100644 index b663bc0c11..0000000000 --- a/inventory/group_vars/copr_back_stg +++ /dev/null @@ -1,20 +0,0 @@ ---- -copr_builder_flavor_name: "ms2.builder" -copr_builder_image_name: "builder-f24" -copr_builder_key_name: "buildsys" -copr_builder_network_name: "coprdev-net" -copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev" -copr_nova_auth_url: "https://fedorainfracloud.org:5000/v2.0" -copr_nova_tenant_id: "a6ff2158641c439a8426d7facab45437" -copr_nova_tenant_name: "coprdev" -copr_nova_username: "copr" -csi_primary_contact: "msuchy (mirek), frostyx, praiskup IRC #fedora-admin, #fedora-buildsys" -csi_purpose: Provide the testing environment of copr's backend -csi_relationship: This host is the testing environment for the cloud infrastructure of copr's backend -# These variables are pushed into /etc/system_identification by the base role. -# Groups and individual hosts should override them with specific info. -# See http://infrastructure.fedoraproject.org/csi/security-policy/ -csi_security_category: Moderate -do_sign: "true" -resolvconf: "resolv.conf/cloud" -spawn_in_advance: "false" diff --git a/inventory/group_vars/copr_dev b/inventory/group_vars/copr_dev deleted file mode 100644 index 19582971de..0000000000 --- a/inventory/group_vars/copr_dev +++ /dev/null @@ -1,22 +0,0 @@ ---- -#_forward-src: "{{ files }}/copr/forward-dev" -_forward_src: "forward_dev" -backend_base_url: "https://download.copr-dev.fedorainfracloud.org" -builders: - # max|max_spawn|max_prealloc - aws: - aarch64: [5, 2, 2] - armhfp: [3, 1, 1] - x86_64: [20, 5, 5] -copr_aws_region: us-east-1 -# don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules - -# eth0, eth1 -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.stg.fedoraproject.org" -keygen_host: "172.25.33.73" -postfix_maincf: "postfix/main.cf/main.cf.copr" -resolvconf: "resolv.conf/cloud" -services_disabled: true diff --git a/inventory/group_vars/copr_dist_git b/inventory/group_vars/copr_dist_git deleted file mode 100644 index c25a51531d..0000000000 --- a/inventory/group_vars/copr_dist_git +++ /dev/null @@ -1,13 +0,0 @@ ---- -datacenter: cloud -freezes: false -# consumed by roles/copr/certbot -letsencrypt: - certificates: - copr-dist-git.fedorainfracloud.org: - challenge_dir: /var/www/html - domains: - - copr-dist-git.fedorainfracloud.org - mail: copr-devel@lists.fedorahosted.org - predefined_deploy_script: httpd -tcp_ports: [22, 80, 443] diff --git a/inventory/group_vars/copr_dist_git_dev b/inventory/group_vars/copr_dist_git_dev deleted file mode 100644 index c9416dfd05..0000000000 --- a/inventory/group_vars/copr_dist_git_dev +++ /dev/null @@ -1,14 +0,0 @@ ---- -datacenter: cloud -devel: true -freezes: false -# consumed by roles/copr/certbot -letsencrypt: - certificates: - copr-dist-git-dev.fedorainfracloud.org: - challenge_dir: /var/www/html - domains: - - copr-dist-git-dev.fedorainfracloud.org - mail: copr-devel@lists.fedorahosted.org - predefined_deploy_script: httpd -tcp_ports: [22, 80, 443] diff --git a/inventory/group_vars/copr_dist_git_stg b/inventory/group_vars/copr_dist_git_stg deleted file mode 100644 index 48c7552018..0000000000 --- a/inventory/group_vars/copr_dist_git_stg +++ /dev/null @@ -1,5 +0,0 @@ ---- -datacenter: cloud -freezes: false -resolvconf: "resolv.conf/cloud" -tcp_ports: [22, 80, 443] diff --git a/inventory/group_vars/copr_hypervisor b/inventory/group_vars/copr_hypervisor deleted file mode 100644 index 6c5168e93a..0000000000 --- a/inventory/group_vars/copr_hypervisor +++ /dev/null @@ -1,26 +0,0 @@ ---- -csi_primary_contact: Fedora Admins - admin@fedoraproject.org -csi_purpose: Host guest virtual machines. -csi_relationship: | - - Guests on this host will be inaccessible if the host is down. - - This host will be required by any application with a virtual machine running on it, therefore, if this host is down those applications will be impacted. -csi_security_category: High -dist_git_base_url: https://example.com/unset -freezes: false -frontend_base_url: https://exmaple.com/unset -ipa_client_shell_groups: - - sysadmin-copr -ipa_client_sudo_groups: - - sysadmin-copr -ipa_host_group: vmhost-copr -ipa_host_group_desc: VM hosts for COPR -nagios_Check_Services: - raid: true -nrpe_procs_crit: 1500 -nrpe_procs_warn: 1400 -postfix_group: copr -postfix_maincf: "postfix/main.cf/main.cf.copr" -primary_auth_source: ipa -rpm_vendor_copr_name: unset vendor -virthost: true -vpn: true diff --git a/inventory/group_vars/copr_keygen b/inventory/group_vars/copr_keygen deleted file mode 100644 index 8ce40f1a64..0000000000 --- a/inventory/group_vars/copr_keygen +++ /dev/null @@ -1,6 +0,0 @@ ---- -# http + signd dest ports -custom_rules: ['-A INPUT -p tcp -m tcp -s 172.25.33.79 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.82.25 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.33.79 --dport 5167 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.82.25 --dport 5167 -j ACCEPT'] -datacenter: cloud -freezes: false -tcp_ports: [22] diff --git a/inventory/group_vars/copr_keygen_dev b/inventory/group_vars/copr_keygen_dev deleted file mode 100644 index 19c4de0777..0000000000 --- a/inventory/group_vars/copr_keygen_dev +++ /dev/null @@ -1,7 +0,0 @@ ---- -copr_hostbase: copr-keygen-dev -# http + signd dest ports -custom_rules: ['-A INPUT -p tcp -m tcp -s 172.25.33.80 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.33.80 --dport 5167 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.144.254 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.144.254 --dport 5167 -j ACCEPT'] -datacenter: cloud -freezes: false -tcp_ports: [] diff --git a/inventory/group_vars/copr_keygen_stg b/inventory/group_vars/copr_keygen_stg deleted file mode 100644 index df6838f5d1..0000000000 --- a/inventory/group_vars/copr_keygen_stg +++ /dev/null @@ -1,8 +0,0 @@ ---- -copr_hostbase: copr-keygen-stg -# http + signd dest ports -custom_rules: ['-A INPUT -p tcp -m tcp -s 172.25.33.49 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.184.44 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.25.33.49 --dport 5167 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 209.132.184.44 --dport 5167 -j ACCEPT'] -datacenter: cloud -freezes: false -resolvconf: "resolv.conf/cloud" -tcp_ports: [] diff --git a/inventory/group_vars/copr_stg b/inventory/group_vars/copr_stg deleted file mode 100644 index f4c68b7856..0000000000 --- a/inventory/group_vars/copr_stg +++ /dev/null @@ -1,9 +0,0 @@ ---- -#_forward-src: "{{ files }}/copr/forward-dev" -_forward_src: "forward_dev" -backend_base_url: "https://copr-be-stg.fedorainfracloud.org" -# don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules -copr_backend_ips: ["172.25.33.49", "209.132.184.44"] -devel: false -dist_git_base_url: "copr-dist-git-stg.fedorainfracloud.org" -keygen_host: "172.25.33.51" diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index a59a43c681..8a16048714 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr_back_dev:copr_back_stg:copr_back:copr_back_dev_aws:copr_back_aws + hosts: copr_back_dev_aws:copr_back_aws user: root gather_facts: False @@ -24,7 +24,7 @@ - swap_file_size_mb is defined - name: cloud basic setup - hosts: copr_back_dev:copr_back_stg:copr_back:copr_back_dev_aws:copr_back_aws + hosts: copr_back_dev_aws:copr_back_aws user: root gather_facts: True vars_files: @@ -44,7 +44,7 @@ # when: env != 'production' - name: provision instance - hosts: copr_back_dev:copr_back_stg:copr_back:copr_back_dev_aws:copr_back_aws + hosts: copr_back_dev_aws:copr_back_aws user: root gather_facts: True diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index d19c35a922..0fc6392583 100644 --- a/playbooks/groups/copr-dist-git.yml +++ b/playbooks/groups/copr-dist-git.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws:copr_dist_git_aws + hosts: copr_dist_git_dev_aws:copr_dist_git_aws user: root gather_facts: False @@ -19,7 +19,7 @@ when: datacenter == 'aws' - name: cloud basic setup - hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws:copr_dist_git_aws + hosts: copr_dist_git_dev_aws:copr_dist_git_aws user: root gather_facts: True vars_files: @@ -40,7 +40,7 @@ when: datacenter != "aws" - name: provision instance - hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws:copr_dist_git_aws + hosts: copr_dist_git_dev_aws:copr_dist_git_aws user: root gather_facts: True diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index 7f998cfdd4..e38473f157 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen:copr_keygen_dev_aws:copr_keygen_aws + hosts: copr_keygen_dev_aws:copr_keygen_aws gather_facts: False vars_files: @@ -28,7 +28,7 @@ when: facts is failed - name: cloud basic setup - hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen:copr_keygen_dev_aws:copr_keygen_aws + hosts: copr_keygen_dev_aws:copr_keygen_aws gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -44,7 +44,7 @@ when: datacenter != "aws" - name: provision instance - hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen:copr_keygen_dev_aws:copr_keygen_aws + hosts: copr_keygen_dev_aws:copr_keygen_aws gather_facts: True vars_files: