communishift: strike all that, we are going to take another tack here.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

inventory/group_vars/communishift

@@ -1 +0,0 @@
-vpn: false

inventory/group_vars/virthost-communishift

@@ -1,2 +0,0 @@
----
-virthost: true

inventory/host_vars/os-node01.fedorainfracloud.org

@@ -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

inventory/host_vars/os-node02.fedorainfracloud.org

@@ -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

inventory/host_vars/os-node09.fedorainfracloud.org

@@ -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

inventory/host_vars/virthost-os01.fedorainfracloud.org

@@ -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

inventory/host_vars/virthost-os02.fedorainfracloud.org

@@ -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

inventory/host_vars/virthost-os09.fedorainfracloud.org

@@ -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

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
 

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
 

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