From 3c4cbc19f5e9ae7933512fea470e7a9911f4cb87 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 15 Sep 2020 15:30:58 -0700 Subject: [PATCH] Add oci-candidate-registry01.stg and oci-registry01.stg Signed-off-by: Kevin Fenzi --- ...idate-registry01.stg.iad2.fedoraproject.org | 18 ++++++++++++++++++ ...idate-registry01.stg.phx2.fedoraproject.org | 18 ------------------ .../oci-registry01.stg.iad2.fedoraproject.org | 18 ++++++++++++++++++ .../oci-registry01.stg.phx2.fedoraproject.org | 18 ------------------ inventory/inventory | 12 +++++++----- playbooks/groups/oci-registry.yml | 3 ++- 6 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org create mode 100644 inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org delete mode 100644 inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..2df4c31d7e --- /dev/null +++ b/inventory/host_vars/oci-candidate-registry01.stg.iad2.fedoraproject.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.167.34 +vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org +datacenter: iad2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org deleted file mode 100644 index 2873f4763c..0000000000 --- a/inventory/host_vars/oci-candidate-registry01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.122 -vmhost: virthost04.stg.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 8192 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org b/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org new file mode 100644 index 0000000000..7386d353b4 --- /dev/null +++ b/inventory/host_vars/oci-registry01.stg.iad2.fedoraproject.org @@ -0,0 +1,18 @@ +--- +nm: 255.255.255.0 +gw: 10.3.167.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.167.35 +vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org +datacenter: iad2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +lvm_size: 120g +mem_size: 8192 +max_mem_size: 16384 +num_cpus: 4 diff --git a/inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org deleted file mode 100644 index 0e56792bc8..0000000000 --- a/inventory/host_vars/oci-registry01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,18 +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-fedora-30 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.128.123 -vmhost: virthost04.stg.phx2.fedoraproject.org -datacenter: phx2 - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 120g -mem_size: 8192 -max_mem_size: 16384 -num_cpus: 4 diff --git a/inventory/inventory b/inventory/inventory index cdae5b2c93..6952482d8c 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -594,8 +594,8 @@ db-fas01.stg.iad2.fedoraproject.org db-koji01.stg.iad2.fedoraproject.org db01.stg.iad2.fedoraproject.org db03.stg.iad2.fedoraproject.org -# oci-candidate-registry01.stg.iad2.fedoraproject.org -# oci-registry01.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 @@ -1038,8 +1038,8 @@ oci-registry02.iad2.fedoraproject.org oci-candidate-registry01.iad2.fedoraproject.org [oci_registry_stg] -# oci-registry01.stg.iad2.fedoraproject.org -# oci-candidate-registry01.stg.iad2.fedoraproject.org +oci-registry01.stg.iad2.fedoraproject.org +oci-candidate-registry01.stg.iad2.fedoraproject.org ## Not the candidate just the top registry [moby_registry] @@ -1047,7 +1047,7 @@ oci-registry01.iad2.fedoraproject.org ## Not the candidate just the top registry [moby_registry_stg] -# oci-registry01.stg.iad2.fedoraproject.org +oci-registry01.stg.iad2.fedoraproject.org [webservers:children] proxies @@ -1363,7 +1363,9 @@ ns02.iad2.fedoraproject.org nuancier01.iad2.fedoraproject.org nuancier02.iad2.fedoraproject.org oci-candidate-registry01.iad2.fedoraproject.org +oci-candidate-registry01.stg.iad2.fedoraproject.org oci-registry01.iad2.fedoraproject.org +oci-registry01.stg.iad2.fedoraproject.org oci-registry02.iad2.fedoraproject.org odcs-backend01.iad2.fedoraproject.org odcs-backend-releng01.iad2.fedoraproject.org diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index 9e28929fa0..c16dc40119 100644 --- a/playbooks/groups/oci-registry.yml +++ b/playbooks/groups/oci-registry.yml @@ -16,7 +16,7 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: fas_client, when: env != "staging" } - collectd/base - rsyncd - sudo @@ -40,6 +40,7 @@ tasks: - import_tasks: "{{ tasks_path }}/2fa_client.yml" + when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: