From c45ed35ce11162abbb671f5862bb02ee51ae8252 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 15 Sep 2020 15:53:26 -0700 Subject: [PATCH] Add resultsdb01.stg Signed-off-by: Kevin Fenzi --- .../resultsdb01.stg.iad2.fedoraproject.org | 30 +++++++++++++++++++ inventory/inventory | 12 ++------ playbooks/groups/resultsdb.yml | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 inventory/host_vars/resultsdb01.stg.iad2.fedoraproject.org diff --git a/inventory/host_vars/resultsdb01.stg.iad2.fedoraproject.org b/inventory/host_vars/resultsdb01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..aef628d7de --- /dev/null +++ b/inventory/host_vars/resultsdb01.stg.iad2.fedoraproject.org @@ -0,0 +1,30 @@ +--- +############################################################ +# networking +############################################################ + +nm: 255.255.255.0 +gw: 10.3.166.254 +dns: 10.3.163.33 +eth0_ip: 10.3.166.36 + +############################################################ +# install +############################################################ + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-31-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/31/Server/x86_64/os/ + +volgroup: /dev/vg_guests +datacenter: iad2 +vmhost: vmhost-x86-05.stg.iad2.fedoraproject.org + +############################################################ +# virtual machine +############################################################ + +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran +lvm_size: 50000 +mem_size: 8192 +num_cpus: 4 +sudoers: "{{ private }}/files/sudo/qavirt-sudoers" diff --git a/inventory/inventory b/inventory/inventory index 6952482d8c..4e372bd853 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -541,15 +541,11 @@ openqa01.iad2.fedoraproject.org [resultsdb:children] resultsdb_stg resultsdb_prod -resultsdb_iad_prod [resultsdb_stg] -#resultsdb-stg01.qa.fedoraproject.org +resultsdb01.stg.iad2.fedoraproject.org [resultsdb_prod] -#resultsdb01.qa.fedoraproject.org - -[resultsdb_iad_prod] resultsdb01.iad2.fedoraproject.org [smtp_mm] @@ -566,7 +562,6 @@ autosign01.stg.iad2.fedoraproject.org # badges-backend01.stg.iad2.fedoraproject.org # badges-web01.stg.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org -# bastion01.stg.iad2.fedoraproject.org # blockerbugs01.stg.iad2.fedoraproject.org bodhi-backend01.stg.iad2.fedoraproject.org # bugzilla2fedmsg01.stg.iad2.fedoraproject.org @@ -596,9 +591,7 @@ db01.stg.iad2.fedoraproject.org db03.stg.iad2.fedoraproject.org oci-candidate-registry01.stg.iad2.fedoraproject.org oci-registry01.stg.iad2.fedoraproject.org -# #fas01.stg.iad2.fedoraproject.org # fedimg01.stg.iad2.fedoraproject.org -# fedocal01.stg.iad2.fedoraproject.org # github2fedmsg01.stg.iad2.fedoraproject.org ipa01.stg.iad2.fedoraproject.org koji01.stg.iad2.fedoraproject.org @@ -611,7 +604,6 @@ mbs-frontend01.stg.iad2.fedoraproject.org # mm-frontend01.stg.iad2.fedoraproject.org # notifs-backend01.stg.iad2.fedoraproject.org # notifs-web01.stg.iad2.fedoraproject.org -# notifs-web02.stg.iad2.fedoraproject.org odcs-backend01.stg.iad2.fedoraproject.org odcs-frontend01.stg.iad2.fedoraproject.org os-control01.stg.iad2.fedoraproject.org @@ -637,7 +629,7 @@ proxy02.stg.iad2.fedoraproject.org rabbitmq01.stg.iad2.fedoraproject.org rabbitmq02.stg.iad2.fedoraproject.org rabbitmq03.stg.iad2.fedoraproject.org -# resultsdb-stg01.qa.fedoraproject.org +resultsdb01.stg.iad2.fedoraproject.org retrace-stg.aws.fedoraproject.org sign-bridge01.stg.iad2.fedoraproject.org sign-vault01.stg.iad2.fedoraproject.org diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml index 3d352978b5..e3ff1c51f0 100644 --- a/playbooks/groups/resultsdb.yml +++ b/playbooks/groups/resultsdb.yml @@ -23,7 +23,7 @@ - { role: rkhunter, tags: ['rkhunter'] } - { role: nagios_client, tags: ['nagios_client'] } - { role: hosts, tags: ['hosts']} - - { role: fas_client, tags: ['fas_client'] } + - { role: fas_client, when: env != "staging", tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } - { role: sudo, tags: ['sudo'] } - { role: openvpn/client,