Make a torrent02 and people02

inventory/host_vars/people02.fedoraproject.org

@@ -0,0 +1,32 @@
+---
+freezes: false
+#host_backup_targets: ['/srv/web']
+
+nm: 255.255.255.128
+gw: 152.19.134.129
+dns: 8.8.8.8
+volgroup: /dev/vg_guests
+eth0_ip: 152.19.134.199
+eth0_nm: 255.255.255.128
+#has_ipv6: yes
+#eth0_ipv6: "2610:28:3090:3001:5054:ff:feff:683f"
+#eth0_ipv6_gw: "2610:28:3090:3001::1"
+
+ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people
+ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
+postfix_group: vpn
+vmhost: ibiblio05.fedoraproject.org
+datacenter: ibiblio
+
+fedmsg_fqdn: people01.vpn.fedoraproject.org
+
+tcp_ports: [80, 443, 9418, 873]
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
+lvm_size: 1t
+mem_size: 8192
+num_cpus: 4
+
+rsyncd_conf: "rsyncd.conf.people01.fedoraproject.org"

inventory/host_vars/torrent02.fedoraproject.org

@@ -0,0 +1,30 @@
+---
+nm: 255.255.255.128
+gw: 152.19.134.129
+dns: 8.8.8.8
+
+volgroup: /dev/vg_guests
+
+eth0_ip: 152.19.134.148
+eth0_nm: 255.255.255.128
+has_ipv6: yes
+eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed7"
+eth0_ipv6_gw: "2610:28:3090:3001::1"
+
+ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
+ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
+
+postfix_group: vpn
+
+vmhost: ibiblio05.fedoraproject.org
+datacenter: ibiblio
+csi_relationship: |
+    torrent02 is the master torrent server for Fedora releases
+
+    * This host relies on:
+    - the virthost it's hosted on (ibiblio03.fedoraproject.org)
+    - FAS to authenticate users
+    - VPN connectivity
+
+    * Things that rely on this host:
+    - if this host is down, Fedora will lose a release distribution channel

inventory/inventory

@@ -468,9 +468,11 @@ mm-crawler-stg
 
 [people]
 people01.fedoraproject.org
+people02.fedoraproject.org
 
 [torrent]
 torrent01.fedoraproject.org
+torrent02.fedoraproject.org
 
 [secondary]
 secondary01.phx2.fedoraproject.org

playbooks/groups/people.yml

@@ -4,7 +4,7 @@
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people01.fedoraproject.org"
 
 - name: make the box be real
-  hosts: people01.fedoraproject.org
+  hosts: people
   user: root
   gather_facts: True
 

scripts/vhost-info

@@ -101,7 +101,7 @@ for hn in sorted(res['contacted']):
         elif type(info) != dict:
             continue
 
-        mem_used += int(info.get('maxMem', 0))/1024
+        mem_used += int(info.get('memory', 0))/1024
         cpu_used += info.get('nrVirtCpu', 0)
         
     mem_used_in_vm[hn] = mem_used