From e1b7e3ea5b6f35d9649cd0aafe3520309819b4e8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 24 Jul 2019 22:35:01 +0000 Subject: [PATCH] kerneltest: drop kerneltest01.stg since a openshift version is being worked on. Signed-off-by: Kevin Fenzi --- inventory/group_vars/kerneltest_stg | 35 ------------------- .../kerneltest01.stg.phx2.fedoraproject.org | 12 ------- inventory/inventory | 3 -- playbooks/groups/kerneltest.yml | 6 ++-- 4 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 inventory/group_vars/kerneltest_stg delete mode 100644 inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org diff --git a/inventory/group_vars/kerneltest_stg b/inventory/group_vars/kerneltest_stg deleted file mode 100644 index d8eb9eb5a3..0000000000 --- a/inventory/group_vars/kerneltest_stg +++ /dev/null @@ -1,35 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 1024 -num_cpus: 1 - -# Definining these vars has a number of effects -# 1) mod_wsgi is configured to use the vars for its own setup -# 2) iptables opens enough ports for all threads for fedmsg -# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads -wsgi_fedmsg_service: kerneltest -wsgi_procs: 2 -wsgi_threads: 1 - -tcp_ports: [ 80 ] - -# Neeed for rsync from log01 for logs. -custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] - -fas_client_groups: sysadmin-noc,sysadmin-veteran - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin - can_send: - - logger.log -- service: kerneltest - owner: root - group: apache - can_send: - - kerneltest.release.edit - - kerneltest.release.new - - kerneltest.upload.new diff --git a/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org b/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org deleted file mode 100644 index 85bf676488..0000000000 --- a/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,12 +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-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_virthost16 -vmhost: virthost05.stg.phx2.fedoraproject.org -datacenter: phx2 - -eth0_ip: 10.5.128.138 diff --git a/inventory/inventory b/inventory/inventory index 91e8301d3c..8d40a71ca3 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -385,9 +385,6 @@ fas01.stg.phx2.fedoraproject.org [kerneltest] kerneltest01.phx2.fedoraproject.org -[kerneltest_stg] -kerneltest01.stg.phx2.fedoraproject.org - [kernel_qa] kernel01.qa.fedoraproject.org kernel02.qa.fedoraproject.org diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 8206d8485c..3bbbfbe681 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -3,10 +3,10 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/kerneltest* or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest_stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest" - name: make the box be real - hosts: kerneltest_stg:kerneltest + hosts: kerneltest user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config - hosts: kerneltest_stg:kerneltest + hosts: kerneltest user: root gather_facts: True