diff --git a/inventory/group_vars/debuginfod b/inventory/group_vars/debuginfod new file mode 100644 index 0000000000..221a2739a7 --- /dev/null +++ b/inventory/group_vars/debuginfod @@ -0,0 +1,28 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 500000 +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 + +deployment_type: prod + +tcp_ports: [ 80 ] + +primary_auth_source: ipa +ipa_host_group: debuginfod +ipa_host_group_desc: debuginfod servers +ipa_client_shell_groups: +- fi-apprentice +- sysadmin-noc +- sysadmin-veteran +- sysadmin-debuginfod +ipa_client_sudo_groups: +- sysadmin-debuginfod + +csi_security_category: Low +csi_primary_contact: "#fedora-admin" +csi_purpose: Provides debuginfod services +csi_relationship: | + - This server provides a debuginfod server to allow downloading debuginfod + diff --git a/inventory/group_vars/debuginfod_stg b/inventory/group_vars/debuginfod_stg new file mode 100644 index 0000000000..d6a01e5622 --- /dev/null +++ b/inventory/group_vars/debuginfod_stg @@ -0,0 +1,28 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 500000 +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 + +deployment_type: stg + +tcp_ports: [ 80 ] + +primary_auth_source: ipa +ipa_host_group: debuginfod +ipa_host_group_desc: debuginfod servers +ipa_client_shell_groups: +- fi-apprentice +- sysadmin-noc +- sysadmin-veteran +- sysadmin-debuginfod +ipa_client_sudo_groups: +- sysadmin-debuginfod + +csi_security_category: Low +csi_primary_contact: "#fedora-admin" +csi_purpose: Provides debuginfod services +csi_relationship: | + - This server provides a debuginfod server to allow downloading debuginfod + diff --git a/inventory/host_vars/debuginfod01.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.iad2.fedoraproject.org new file mode 100644 index 0000000000..56111c0648 --- /dev/null +++ b/inventory/host_vars/debuginfod01.iad2.fedoraproject.org @@ -0,0 +1,12 @@ +--- +nm: 255.255.255.0 +gw: 10.3.163.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-33 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/x86_64/os/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.163.109 +vmhost: vmhost-x86-06.iad2.fedoraproject.org +datacenter: iad2 +virt_install_command: "{{ virt_install_command_one_nic }}" +sar_script_user: root diff --git a/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org b/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..9503ebf0b0 --- /dev/null +++ b/inventory/host_vars/debuginfod01.stg.iad2.fedoraproject.org @@ -0,0 +1,10 @@ +--- +nm: 255.255.255.0 +gw: 10.3.166.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-33 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/33/Server/x86_64/os/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.166.62 +vmhost: vmhost-x86-08.stg.iad2.fedoraproject.org +datacenter: iad2 diff --git a/inventory/inventory b/inventory/inventory index 561d9a3bef..e645a3f1fc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -663,6 +663,7 @@ db-fas01.stg.iad2.fedoraproject.org db-koji01.stg.iad2.fedoraproject.org db01.stg.iad2.fedoraproject.org db03.stg.iad2.fedoraproject.org +debuginfod01.stg.iad2.fedoraproject.org oci-candidate-registry01.stg.iad2.fedoraproject.org oci-registry01.stg.iad2.fedoraproject.org # fedimg01.stg.iad2.fedoraproject.org @@ -1008,6 +1009,12 @@ copr-db-stg.aws.fedoraproject.org # virthost-aarch64-os01.fedorainfracloud.org # virthost-aarch64-os02.fedorainfracloud.org +[debuginfod] +debuginfod01.iad2.fedoraproject.org + +[debuginfod_stg] +debuginfod01.stg.iad2.fedoraproject.org + [pagure] pagure02.fedoraproject.org diff --git a/main.yml b/main.yml index 9cd3d9a0a0..6f95b8d362 100644 --- a/main.yml +++ b/main.yml @@ -32,6 +32,7 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml +- import_playbook: /srv/web/infra/ansible/playbooks/groups/debuginfod.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml diff --git a/playbooks/groups/debuginfod.yml b/playbooks/groups/debuginfod.yml new file mode 100644 index 0000000000..cb8e3d4625 --- /dev/null +++ b/playbooks/groups/debuginfod.yml @@ -0,0 +1,32 @@ +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=debuginfod:debuginfod_stg" + +- name: make the box be real + hosts: debuginfod:debuginfod_stg + user: root + gather_facts: True + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + pre_tasks: + - import_tasks: "{{ tasks_path }}/yumrepos.yml" + + roles: + - base + - rkhunter + - nagios_client + - hosts + - ipa/client + - collectd/base + + - role: nfs/client + mnt_dir: '/mnt/fedora_koji_prod' + nfs_src_dir: "fedora_koji" + + tasks: + - import_tasks: "{{ tasks_path }}/motd.yml" + + handlers: + - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 833af2453f..b9d1f27911 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -751,9 +751,8 @@ - role: httpd/reverseproxy website: debuginfod.fedoraproject.org destname: debuginfod - balancer_name: app-os - targettype: openshift - keephost: true - when: env == "staging" + remotepath: / + localpath: / + proxyurl: http://debuginfod01 tags: debuginfod diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index c8d08ad8d0..a47c1c693a 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -975,7 +975,6 @@ server_aliases: [debuginfod.stg.fedoraproject.org] cert_name: "{{wildcard_cert_name}}" tags: debuginfod - when: env == "staging" - role: httpd/website site_name: calendar.fedoraproject.org