From 19703e17bb193de06eba437a40c12ffc28a3344f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 25 Feb 2020 20:03:24 +0000 Subject: [PATCH] move el6/el7 maintainer test instances Signed-off-by: Kevin Fenzi --- inventory/host_vars/el6-test.fedorainfracloud.org | 15 --------------- inventory/host_vars/el7-test.fedorainfracloud.org | 15 --------------- inventory/inventory | 4 ++-- playbooks/groups/maintainer-test.yml | 7 ------- 4 files changed, 2 insertions(+), 39 deletions(-) diff --git a/inventory/host_vars/el6-test.fedorainfracloud.org b/inventory/host_vars/el6-test.fedorainfracloud.org index f999d91b67..e70b550188 100644 --- a/inventory/host_vars/el6-test.fedorainfracloud.org +++ b/inventory/host_vars/el6-test.fedorainfracloud.org @@ -1,17 +1,2 @@ --- -image: CentOS-6-x86_64-GenericCloud-1907 -instance_type: ms1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest -zone: nova tcp_ports: [22] - -inventory_tenant: maintainertest -inventory_instance_name: el6-test -hostbase: el6-test -public_ip: 209.132.184.220 -description: el6-test instance - -cloud_networks: - # maintainertest-net - - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/host_vars/el7-test.fedorainfracloud.org b/inventory/host_vars/el7-test.fedorainfracloud.org index 7922987c9a..e70b550188 100644 --- a/inventory/host_vars/el7-test.fedorainfracloud.org +++ b/inventory/host_vars/el7-test.fedorainfracloud.org @@ -1,17 +1,2 @@ --- -image: CentOS-7-x86_64-GenericCloud-1503 -instance_type: ms1.medium -keypair: fedora-admin-20130801 -security_group: ssh-anywhere-maintainertest,web-80-anywhere-maintainertest,default,web-443-anywhere-maintainertest,all-icmp-maintainertest -zone: nova tcp_ports: [22] - -inventory_tenant: maintainertest -inventory_instance_name: el7-test -hostbase: el7-test -public_ip: 209.132.184.221 -description: el7-test instance - -cloud_networks: - # maintainertest-net - - net-id: "a512d096-3fa2-49cc-b989-d43ca687f91d" diff --git a/inventory/inventory b/inventory/inventory index 9fe5f8bce3..ee0631671d 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1027,11 +1027,11 @@ f30-test.fedorainfracloud.org f31-test.fedorainfracloud.org f32-test.fedorainfracloud.org rawhide-test.fedorainfracloud.org +el6-test.fedorainfracloud.org +el7-test.fedorainfracloud.org [maintainer_test_oldcloud] ppc64le-test.fedorainfracloud.org -el6-test.fedorainfracloud.org -el7-test.fedorainfracloud.org [aarch64_test] aarch64-test01.fedorainfracloud.org diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index 7ef791c5dd..81ff2811ce 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -24,13 +24,6 @@ - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: set hostname (required by some services, at least postfix need it) hostname: name="{{inventory_hostname}}" - - debug: var=FedoraRawhideNumber - - debug: var=FedoraBranchedNumber - - debug: var=FedoraCycleNumber - - debug: var=FedoraPreviousCycleNumber - - debug: var=FedoraPreviousPreviousCycleNumber - - debug: var=Frozen - - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=arm_packager"