diff --git a/inventory/host_vars/osbs-control01.stg.iad2.fedoraproject.org b/inventory/host_vars/osbs-control01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..36df3aec99 --- /dev/null +++ b/inventory/host_vars/osbs-control01.stg.iad2.fedoraproject.org @@ -0,0 +1,15 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +eth0_ip: 10.3.167.38 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2 +ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ + +volgroup: /dev/vg_guests +vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org +datacenter: iad2 + +mem_size: 4096 +max_mem_size: 4096 diff --git a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org deleted file mode 100644 index 318088f1d8..0000000000 --- a/inventory/host_vars/osbs-control01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,15 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 -eth0_ip: 10.5.128.160 - -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_guests -vmhost: bvirthost01.stg.phx2.fedoraproject.org -datacenter: phx2 - -mem_size: 4096 -max_mem_size: 4096 diff --git a/inventory/host_vars/osbs-master01.stg.iad2.fedoraproject.org b/inventory/host_vars/osbs-master01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..6bbbd02f77 --- /dev/null +++ b/inventory/host_vars/osbs-master01.stg.iad2.fedoraproject.org @@ -0,0 +1,22 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +eth0_ip: 10.3.167.39 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ + +volgroup: /dev/vg_guests +vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org +datacenter: iad2 + +host_group: osbs-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 16384 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org deleted file mode 100644 index 7c507779b3..0000000000 --- a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.161 -vmhost: virthost04.stg.phx2.fedoraproject.org -datacenter: phx2 -host_group: osbs-stg - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/osbs-node01.stg.iad2.fedoraproject.org b/inventory/host_vars/osbs-node01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..4f7bfba487 --- /dev/null +++ b/inventory/host_vars/osbs-node01.stg.iad2.fedoraproject.org @@ -0,0 +1,22 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +eth0_ip: 10.3.167.40 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ + +volgroup: /dev/vg_guests +vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org +datacenter: iad2 + +host_group: osbs-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 16384 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org deleted file mode 100644 index 354326cf68..0000000000 --- a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.162 -vmhost: virthost04.stg.phx2.fedoraproject.org -datacenter: phx2 -host_group: osbs-stg - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/osbs-node02.stg.iad2.fedoraproject.org b/inventory/host_vars/osbs-node02.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..30d5029644 --- /dev/null +++ b/inventory/host_vars/osbs-node02.stg.iad2.fedoraproject.org @@ -0,0 +1,22 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +eth0_ip: 10.3.167.41 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-osbs +ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/ + +volgroup: /dev/vg_guests +vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org +datacenter: iad2 + +host_group: osbs-stg + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 16384 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org deleted file mode 100644 index a6030bec11..0000000000 --- a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,19 +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-osbs -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.163 -vmhost: virthost04.stg.phx2.fedoraproject.org -datacenter: phx2 -host_group: osbs-stg - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 16384 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/inventory b/inventory/inventory index 80c5b8d0e0..6da6ccad9b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -619,10 +619,10 @@ os-node02.stg.iad2.fedoraproject.org os-node03.stg.iad2.fedoraproject.org os-node04.stg.iad2.fedoraproject.org os-node05.stg.iad2.fedoraproject.org -# osbs-control01.stg.iad2.fedoraproject.org -# osbs-master01.stg.iad2.fedoraproject.org -# osbs-node01.stg.iad2.fedoraproject.org -# osbs-node02.stg.iad2.fedoraproject.org +osbs-control01.stg.iad2.fedoraproject.org +osbs-master01.stg.iad2.fedoraproject.org +osbs-node01.stg.iad2.fedoraproject.org +osbs-node02.stg.iad2.fedoraproject.org # osbs-aarch64-master01.stg.iad2.fedoraproject.org # osbs-aarch64-node01.stg.iad2.fedoraproject.org # osbs-aarch64-node02.stg.iad2.fedoraproject.org @@ -931,7 +931,7 @@ pagure-stg01.fedoraproject.org osbs-control01.iad2.fedoraproject.org [osbs_control_stg] -# osbs-control01.stg.iad2.fedoraproject.org +osbs-control01.stg.iad2.fedoraproject.org [osbs_nodes] osbs-node01.iad2.fedoraproject.org @@ -954,7 +954,7 @@ osbs_masters #osbs_aarch64_masters [osbs_masters_stg] -# osbs-master01.stg.iad2.fedoraproject.org +osbs-master01.stg.iad2.fedoraproject.org [osbs_aarch64_masters_stg] # osbs-aarch64-master01.stg.iad2.fedoraproject.org @@ -964,8 +964,8 @@ osbs_masters # osbs-aarch64-node02.stg.iad2.fedoraproject.org [osbs_nodes_stg] -# osbs-node01.stg.iad2.fedoraproject.org -# osbs-node02.stg.iad2.fedoraproject.org +osbs-node01.stg.iad2.fedoraproject.org +osbs-node02.stg.iad2.fedoraproject.org [osbs_stg:children] osbs_control_stg diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 8024d570fb..03199377dc 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -24,7 +24,7 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: fas_client, when: env != "staging" } - sudo - collectd/base - rsyncd @@ -41,6 +41,7 @@ name: subscription-manager-rhsm-certificates state: present - import_tasks: "{{ tasks_path }}/2fa_client.yml" + when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: