diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index 3501931a47..2bb1bd0e9d 100644 --- a/inventory/group_vars/bastion +++ b/inventory/group_vars/bastion @@ -21,7 +21,7 @@ custom_rules: [ # # allow a bunch of sysadmin groups here so they can access internal stuff -fas_client_groups: sysadmin-analysis,sysadmin-ask,sysadmin-atomic,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,pungi-devel,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-gnome,sysadmin-copr,sysadmin-coreos,sysadmin-dbgserver,sysadmin-osbs,sysadmin-odcs,sysadmin-kernel +fas_client_groups: sysadmin-analysis,sysadmin-ask,sysadmin-atomic,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran,sysadmin-mbs,pungi-devel,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-gnome,sysadmin-copr,sysadmin-coreos,sysadmin-osbs,sysadmin-odcs,sysadmin-kernel ipa_host_group: bastion ipa_host_group_desc: Bastion hosts @@ -32,7 +32,6 @@ bastion_ipa_client_shell_groups: - pungi-devel - sysadmin-analysis - sysadmin-dba -- sysadmin-dbgserver - sysadmin-ppc - sysadmin-secondary - sysadmin-spin diff --git a/inventory/group_vars/bastion_stg b/inventory/group_vars/bastion_stg index 5676c4310e..b4ccb05934 100644 --- a/inventory/group_vars/bastion_stg +++ b/inventory/group_vars/bastion_stg @@ -31,7 +31,6 @@ bastion_ipa_client_shell_groups: - pungi-devel - sysadmin-analysis - sysadmin-dba -- sysadmin-dbgserver - sysadmin-ppc - sysadmin-secondary - sysadmin-spin diff --git a/inventory/host_vars/dbgserver01.stg.phx2.fedoraproject.org b/inventory/host_vars/dbgserver01.stg.phx2.fedoraproject.org deleted file mode 100644 index d44afcc38a..0000000000 --- a/inventory/host_vars/dbgserver01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,31 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ - -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.57 -eth1_ip: 10.5.127.246 -vmhost: virthost01.stg.phx2.fedoraproject.org -datacenter: phx2 - -lvm_size: 20000 -mem_size: 4096 -num_cpus: 4 -freezes: false - -virt_install_command: "{{ virt_install_command_two_nic }}" - -sudoers: "{{ private }}/files/sudo/dbgserver-sudoers" - -# No monitoring requested for this host. -nagios_Check_Services: - mail: false - nrpe: false - sshd: false - swap: false - ping: false - diff --git a/inventory/inventory b/inventory/inventory index 9d915ee918..d13d9d4baa 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -8,9 +8,6 @@ rabbitmq01.stg.iad2.fedoraproject.org rabbitmq02.stg.iad2.fedoraproject.org rabbitmq03.stg.iad2.fedoraproject.org -[dbgserver_stg] -# dbgserver01.stg.iad2.fedoraproject.org - [releng_compose] compose-x86-01.iad2.fedoraproject.org compose-branched01.iad2.fedoraproject.org diff --git a/main.yml b/main.yml index 96e4262bda..cc2f46780d 100644 --- a/main.yml +++ b/main.yml @@ -32,7 +32,6 @@ - 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/dbgserver.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/dbgserver.yml b/playbooks/groups/dbgserver.yml deleted file mode 100644 index bcbe64ada4..0000000000 --- a/playbooks/groups/dbgserver.yml +++ /dev/null @@ -1,35 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dbgserver_stg" - -- name: make the box be real - hosts: dbgserver_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 - - { role: ipa/client, when: env == "staging" } - - { role: fas_client, when: env != "staging" } - - sudo - - collectd/base - - - role: nfs/client - mnt_dir: '/mnt/fedora_koji_prod' - nfs_src_dir: "fedora_koji" - - tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml"