From 319d35e721249ea024e3bd5847e079cfa0f3d0ea Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 9 May 2019 20:14:47 +0000 Subject: [PATCH] communishift: Hey look, a bunch of communishift nodes and virthosts and such. Note: This is not in the os-cluster playbook now except to install base items. Signed-off-by: Kevin Fenzi --- inventory/group_vars/communishift | 1 + .../os-control01.fedorainfracloud.org | 14 ++++++ .../os-master01.fedorainfracloud.org | 14 ++++++ .../os-master02.fedorainfracloud.org | 14 ++++++ .../os-master03.fedorainfracloud.org | 14 ++++++ .../host_vars/os-node01.fedorainfracloud.org | 14 ++++++ .../host_vars/os-node02.fedorainfracloud.org | 14 ++++++ .../host_vars/os-node09.fedorainfracloud.org | 14 ++++++ inventory/inventory | 47 ++++++++++++++----- playbooks/groups/os-cluster.yml | 2 +- playbooks/groups/virthost.yml | 4 +- 11 files changed, 137 insertions(+), 15 deletions(-) create mode 100644 inventory/group_vars/communishift create mode 100644 inventory/host_vars/os-control01.fedorainfracloud.org create mode 100644 inventory/host_vars/os-master01.fedorainfracloud.org create mode 100644 inventory/host_vars/os-master02.fedorainfracloud.org create mode 100644 inventory/host_vars/os-master03.fedorainfracloud.org create mode 100644 inventory/host_vars/os-node01.fedorainfracloud.org create mode 100644 inventory/host_vars/os-node02.fedorainfracloud.org create mode 100644 inventory/host_vars/os-node09.fedorainfracloud.org diff --git a/inventory/group_vars/communishift b/inventory/group_vars/communishift new file mode 100644 index 0000000000..8c74b4b6ea --- /dev/null +++ b/inventory/group_vars/communishift @@ -0,0 +1 @@ +vpn: false diff --git a/inventory/host_vars/os-control01.fedorainfracloud.org b/inventory/host_vars/os-control01.fedorainfracloud.org new file mode 100644 index 0000000000..d9a84cff40 --- /dev/null +++ b/inventory/host_vars/os-control01.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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.31 +vmhost: virthost-os01.fedorainfracloud.org +datacenter: cloud + +baseiptables: true diff --git a/inventory/host_vars/os-master01.fedorainfracloud.org b/inventory/host_vars/os-master01.fedorainfracloud.org new file mode 100644 index 0000000000..11dc05d620 --- /dev/null +++ b/inventory/host_vars/os-master01.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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.32 +vmhost: virthost-os01.fedorainfracloud.org +datacenter: cloud + +baseiptables: true diff --git a/inventory/host_vars/os-master02.fedorainfracloud.org b/inventory/host_vars/os-master02.fedorainfracloud.org new file mode 100644 index 0000000000..d06838f316 --- /dev/null +++ b/inventory/host_vars/os-master02.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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.33 +vmhost: virthost-os02.fedorainfracloud.org +datacenter: cloud + +baseiptables: true diff --git a/inventory/host_vars/os-master03.fedorainfracloud.org b/inventory/host_vars/os-master03.fedorainfracloud.org new file mode 100644 index 0000000000..a872ac3fa2 --- /dev/null +++ b/inventory/host_vars/os-master03.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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.34 +vmhost: virthost-os09.fedorainfracloud.org +datacenter: cloud + +baseiptables: true diff --git a/inventory/host_vars/os-node01.fedorainfracloud.org b/inventory/host_vars/os-node01.fedorainfracloud.org new file mode 100644 index 0000000000..3821c9832f --- /dev/null +++ b/inventory/host_vars/os-node01.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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 new file mode 100644 index 0000000000..e30860e8e5 --- /dev/null +++ b/inventory/host_vars/os-node02.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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 new file mode 100644 index 0000000000..902e28a31a --- /dev/null +++ b/inventory/host_vars/os-node09.fedorainfracloud.org @@ -0,0 +1,14 @@ +--- +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/inventory b/inventory/inventory index b539492780..8edc88112b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1366,6 +1366,37 @@ 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 @@ -1503,18 +1534,10 @@ retrace01.qa.fedoraproject.org drives45-01.phx2.fedoraproject.org # communishift -- community openshift -[communishift] -#virthost-os01.fedorainfracloud.org -#virthost-os02.fedorainfracloud.org -#os-node03.fedorainfracloud.org -#os-node04.fedorainfracloud.org -#os-node05.fedorainfracloud.org -#os-node06.fedorainfracloud.org -#os-node07.fedorainfracloud.org -#os-node08.fedorainfracloud.org -#virthost-os09.fedorainfracloud.org -#os-node10.fedorainfracloud.org -#os-node11.fedorainfracloud.org +[virthost-communishift] +virthost-os01.fedorainfracloud.org +virthost-os02.fedorainfracloud.org +virthost-os09.fedorainfracloud.org #os-storage-node12.fedorainfracloud.org #os-storage-node13.fedorainfracloud.org #os-storage-node14.fedorainfracloud.org diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 2c00fa2679..6f48576509 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 + hosts: os-control:os-control-stg:os-masters-stg:os-nodes-stg:os-masters:os-nodes:os-communishift user: root gather_facts: True diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 85cc3e9b04..94241690e1 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:communishift" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift" - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:communishift + hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift user: root gather_facts: True