From 82cb3bbf184b8a28e2049486bbf5d4d5f7176379 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 9 May 2019 21:20:40 +0000 Subject: [PATCH] communishift: strike all that, we are going to take another tack here. Signed-off-by: Kevin Fenzi --- inventory/group_vars/communishift | 1 - inventory/group_vars/virthost-communishift | 2 -- .../host_vars/os-node01.fedorainfracloud.org | 14 --------- .../host_vars/os-node02.fedorainfracloud.org | 14 --------- .../host_vars/os-node09.fedorainfracloud.org | 14 --------- .../virthost-os01.fedorainfracloud.org | 14 --------- .../virthost-os02.fedorainfracloud.org | 14 --------- .../virthost-os09.fedorainfracloud.org | 14 --------- inventory/inventory | 31 ------------------- playbooks/groups/os-cluster.yml | 2 +- playbooks/groups/virthost.yml | 4 +-- 11 files changed, 3 insertions(+), 121 deletions(-) delete mode 100644 inventory/group_vars/communishift delete mode 100644 inventory/group_vars/virthost-communishift delete mode 100644 inventory/host_vars/os-node01.fedorainfracloud.org delete mode 100644 inventory/host_vars/os-node02.fedorainfracloud.org delete mode 100644 inventory/host_vars/os-node09.fedorainfracloud.org delete mode 100644 inventory/host_vars/virthost-os01.fedorainfracloud.org delete mode 100644 inventory/host_vars/virthost-os02.fedorainfracloud.org delete mode 100644 inventory/host_vars/virthost-os09.fedorainfracloud.org diff --git a/inventory/group_vars/communishift b/inventory/group_vars/communishift deleted file mode 100644 index 8c74b4b6ea..0000000000 --- a/inventory/group_vars/communishift +++ /dev/null @@ -1 +0,0 @@ -vpn: false diff --git a/inventory/group_vars/virthost-communishift b/inventory/group_vars/virthost-communishift deleted file mode 100644 index d7aff060d9..0000000000 --- a/inventory/group_vars/virthost-communishift +++ /dev/null @@ -1,2 +0,0 @@ ---- -virthost: true diff --git a/inventory/host_vars/os-node01.fedorainfracloud.org b/inventory/host_vars/os-node01.fedorainfracloud.org deleted file mode 100644 index 3821c9832f..0000000000 --- a/inventory/host_vars/os-node01.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_Server -eth0_ip: 38.145.48.28 -vmhost: virthost-os01.fedorainfracloud.org -datacenter: cloud - -baseiptables: true diff --git a/inventory/host_vars/os-node02.fedorainfracloud.org b/inventory/host_vars/os-node02.fedorainfracloud.org deleted file mode 100644 index e30860e8e5..0000000000 --- a/inventory/host_vars/os-node02.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_Server -eth0_ip: 38.145.48.29 -vmhost: virthost-os02.fedorainfracloud.org -datacenter: cloud - -baseiptables: true diff --git a/inventory/host_vars/os-node09.fedorainfracloud.org b/inventory/host_vars/os-node09.fedorainfracloud.org deleted file mode 100644 index 902e28a31a..0000000000 --- a/inventory/host_vars/os-node09.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ - -volgroup: /dev/vg_Server -eth0_ip: 38.145.48.30 -vmhost: virthost-os09.fedorainfracloud.org -datacenter: cloud - -baseiptables: true diff --git a/inventory/host_vars/virthost-os01.fedorainfracloud.org b/inventory/host_vars/virthost-os01.fedorainfracloud.org deleted file mode 100644 index 1c897296b3..0000000000 --- a/inventory/host_vars/virthost-os01.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -fas_client_groups: sysadmin-cloud,sysadmin-main -sudoers: "{{ private }}/files/sudo/sysadmin-cloud" -datacenter: cloud -br0_ip: 38.145.48.11 -br0_nm: 255.255.254.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -postfix_group: cloud -vpn: false -copr_build_virthost: true -#nrpe: false -freezes: false diff --git a/inventory/host_vars/virthost-os02.fedorainfracloud.org b/inventory/host_vars/virthost-os02.fedorainfracloud.org deleted file mode 100644 index e9b74ca6c4..0000000000 --- a/inventory/host_vars/virthost-os02.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -fas_client_groups: sysadmin-cloud,sysadmin-main -sudoers: "{{ private }}/files/sudo/sysadmin-cloud" -datacenter: cloud -br0_ip: 38.145.48.12 -br0_nm: 255.255.254.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -postfix_group: cloud -vpn: false -copr_build_virthost: true -#nrpe: false -freezes: false diff --git a/inventory/host_vars/virthost-os09.fedorainfracloud.org b/inventory/host_vars/virthost-os09.fedorainfracloud.org deleted file mode 100644 index 878061e8d1..0000000000 --- a/inventory/host_vars/virthost-os09.fedorainfracloud.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -fas_client_groups: sysadmin-cloud,sysadmin-main -sudoers: "{{ private }}/files/sudo/sysadmin-cloud" -datacenter: cloud -br0_ip: 38.145.48.19 -br0_nm: 255.255.254.0 -gw: 38.145.49.254 -dns: 8.8.8.8 - -postfix_group: cloud -vpn: false -copr_build_virthost: true -#nrpe: false -freezes: false diff --git a/inventory/inventory b/inventory/inventory index 8edc88112b..3d929b19ab 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1366,37 +1366,6 @@ osbs-nodes-stg osbs-aarch64-masters-stg osbs-aarch64-nodes-stg -[os-control-communishift] -os-control01.fedorainfracloud.org - -[os-masters-communishift] -os-master01.fedorainfracloud.org -os-master02.fedorainfracloud.org -os-master03.fedorainfracloud.org - -[os-nodes-communishift] -# this node is a vm on virthost-os01 -os-node01.fedorainfracloud.org -# this node is a vm on virthost-os02 -os-node02.fedorainfracloud.org -# These are bare metal nodes -os-node03.fedorainfracloud.org -os-node04.fedorainfracloud.org -os-node05.fedorainfracloud.org -os-node06.fedorainfracloud.org -os-node07.fedorainfracloud.org -os-node08.fedorainfracloud.org -# this node is a vm on virthost-os03 -os-node09.fedorainfracloud.org -# These are bare metal nodes -os-node10.fedorainfracloud.org -os-node11.fedorainfracloud.org - -[os-communishift:children] -os-nodes-communishift -os-masters-communishift -os-control-communishift - [os-control-stg] os-control01.stg.phx2.fedoraproject.org diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 6f48576509..2c00fa2679 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-control-stg:os-control:os-nodes-stg:os-masters-stg:os-nodes:os-masters" - name: make the box be real - hosts: os-control:os-control-stg:os-masters-stg:os-nodes-stg:os-masters:os-nodes:os-communishift + hosts: os-control:os-control-stg:os-masters-stg:os-nodes-stg:os-masters:os-nodes user: root gather_facts: True diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 94241690e1..1422d1b6fd 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -2,10 +2,10 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=virthost:bvirthost:buildvmhost:virthost-comm:colo-virt" - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift + hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt user: root gather_facts: True