Add sundries02, wiki02 and datagrepper02

Add some more '02' instances to increase uptime/availibility.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

inventory/host_vars/datagrepper02.iad2.fedoraproject.org

@@ -0,0 +1,13 @@
+---
+nm: 255.255.255.0
+gw: 10.3.163.254
+dns: 10.3.163.33
+
+volgroup: /dev/vg_guests
+vmhost: vmhost-x86-04.iad2.fedoraproject.org
+datacenter: iad2
+
+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/
+
+eth0_ip: 10.3.163.103

inventory/host_vars/sundries02.iad2.fedoraproject.org

@@ -0,0 +1,18 @@
+---
+nm: 255.255.255.0
+gw: 10.3.163.254
+dns: 10.3.163.34
+eth0_ip: 10.3.163.101
+datacenter: iad2
+
+
+vmhost: vmhost-x86-05.iad2.fedoraproject.org
+volgroup: /dev/vg_guests
+virt_install_command: "{{ virt_install_command_one_nic }}"
+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/
+
+# This overrides a group var and lets the playbook know that we should
+# install special cron jobs here.
+master_sundries_node: True
+

inventory/host_vars/wiki02.iad2.fedoraproject.org

@@ -0,0 +1,11 @@
+---
+nm: 255.255.255.0
+gw: 10.3.163.254
+dns: 10.3.163.33
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad
+ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.163.102
+vmhost: vmhost-x86-06.iad2.fedoraproject.org
+datacenter: iad2
+virt_install_command: "{{ virt_install_command_one_nic }}"

inventory/inventory

@@ -104,6 +104,7 @@ virthost-cc-rdu03.fedoraproject.org
 
 [datagrepper]
 datagrepper01.iad2.fedoraproject.org
+datagrepper02.iad2.fedoraproject.org
 
 [datagrepper_stg]
 # datagrepper01.stg.iad2.fedoraproject.org
@@ -652,6 +653,7 @@ tang02.iad2.fedoraproject.org
 
 [sundries]
 sundries01.iad2.fedoraproject.org
+sundries02.iad2.fedoraproject.org
 
 [sundries_stg]
 # sundries01.stg.iad2.fedoraproject.org
@@ -699,6 +701,7 @@ qvmhost-x86-02.iad2.fedoraproject.org
 
 [wiki]
 wiki01.iad2.fedoraproject.org
+wiki02.iad2.fedoraproject.org
 
 [zanata2fedmsg_stg]
 # zanata2fedmsg01.stg.iad2.fedoraproject.org
@@ -1288,6 +1291,7 @@ compose-branched01.iad2.fedoraproject.org
 compose-rawhide01.iad2.fedoraproject.org
 compose-x86-01.iad2.fedoraproject.org
 datagrepper01.iad2.fedoraproject.org
+datagrepper02.iad2.fedoraproject.org
 db-datanommer01.iad2.fedoraproject.org
 db-fas01.iad2.fedoraproject.org
 db-koji01.iad2.fedoraproject.org
@@ -1365,6 +1369,7 @@ secondary01.iad2.fedoraproject.org
 sign-bridge01.iad2.fedoraproject.org
 sign-vault01.iad2.fedoraproject.org
 sundries01.iad2.fedoraproject.org
+sundries02.iad2.fedoraproject.org
 tang01.iad2.fedoraproject.org
 tang02.iad2.fedoraproject.org
 value01.iad2.fedoraproject.org
@@ -1376,6 +1381,7 @@ vmhost-x86-05.iad2.fedoraproject.org
 vmhost-x86-06.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 wiki01.iad2.fedoraproject.org
+wiki02.iad2.fedoraproject.org
 
 
 [iad2:vars]

roles/haproxy/templates/haproxy.cfg

@@ -44,9 +44,9 @@ frontend fp-wiki-frontend
 backend fp-wiki-backend
     balance hdr(appserver)
     server  wiki01 wiki01:80 check inter 15s rise 2 fall 5
-# {% if env == "production" %}
+{% if env == "production" %}
-#     server  wiki02 wiki02:80 check inter 15s rise 2 fall 5
+    server  wiki02 wiki02:80 check inter 15s rise 2 fall 5
-# {% endif %}
+{% endif %}
     option  httpchk GET /wiki/Main_Page
 
 frontend mirror-lists-frontend
@@ -71,9 +71,6 @@ frontend mirrormanager-frontend
 backend mirrormanager-backend
     balance hdr(appserver)
     server  mm-frontend01 mm-frontend01:80 check inter 60s rise 2 fall 3
-# {% if env == "production" %}
-#     server  mm-frontend02 mm-frontend02:80 check inter 60s rise 2 fall 3
-# {% endif %}
     option  httpchk GET /mirrormanager/static/mirrormanager2.css
 
 frontend freemedia-frontend
@@ -83,9 +80,9 @@ frontend freemedia-frontend
 backend freemedia-backend
     balance hdr(appserver)
     server  sundries01 sundries01:80 check inter 60s rise 2 fall 3
-# {% if env == "production" %}
+{% if env == "production" %}
-#     server  sundries02 sundries01:80 check inter 60s rise 2 fall 3
+    server  sundries02 sundries01:80 check inter 60s rise 2 fall 3
-# {% endif %}
+{% endif %}
     option  httpchk GET /freemedia/FreeMedia-form.html
 
 frontend packages-frontend
@@ -117,9 +114,6 @@ frontend blockerbugs-frontend
 backend blockerbugs-backend
     balance hdr(appserver)
     server  blockerbugs01 blockerbugs01:80 check inter 10s rise 1 fall 2
-# {% if env == "production" %}
-#     server  blockerbugs02 blockerbugs02:80 check inter 10s rise 1 fall 2
-# {% endif %}
     option httpchk GET /blockerbugs
 
 frontend fedocal-frontend
@@ -129,9 +123,6 @@ frontend fedocal-frontend
 backend fedocal-backend
     balance hdr(appserver)
     server  fedocal01 fedocal01:80 check inter 10s rise 1 fall 2
-# {% if env == "production" %}
-#     server  fedocal02 fedocal02:80 check inter 10s rise 1 fall 2
-# {% endif %}
     option httpchk GET /calendar
 
 # IMPORTANT: 10023-10026 will NOT work because of selinux policies
@@ -143,9 +134,9 @@ frontend datagrepper-frontend
 backend datagrepper-backend
     balance hdr(appserver)
     server  datagrepper01 datagrepper01:80 check inter 10s rise 1 fall 2
-# {% if env == "production" %}
+{% if env == "production" %}
-#     server  datagrepper02 datagrepper02:80 check inter 10s rise 1 fall 2
+    server  datagrepper02 datagrepper02:80 check inter 10s rise 1 fall 2
-# {% endif %}
+{% endif %}
     option httpchk GET /datagrepper/reference/
 
 frontend geoip-city-frontend
@@ -155,9 +146,9 @@ frontend geoip-city-frontend
 backend geoip-city-backend
     balance hdr(appserver)
     server  sundries01 sundries01:80 check inter 30s rise 2 fall 3
-# {% if env == "production" %}
+{% if env == "production" %}
-#     server  sundries02 sundries02:80 check inter 30s rise 2 fall 3
+    server  sundries02 sundries02:80 check inter 30s rise 2 fall 3
-# {% endif %}
+{% endif %}
     option  httpchk GET /city?ip=18.0.0.1
 
 # IMPORTANT: 10031 will NOT work because of selinux policies
@@ -169,9 +160,6 @@ frontend badges-frontend
 backend badges-backend
     balance hdr(appserver)
     server  badges-web01 badges-web01:80 check inter 10s rise 1 fall 2
-# {% if env == "production" %}
-#     server  badges-web02 badges-web02:80 check inter 10s rise 1 fall 2
-# {% endif %}
     option httpchk GET /heartbeat
 
 frontend nuancier-frontend
@@ -347,7 +335,7 @@ backend krb5-backend
     timeout connect 86400000
     server  ipa01 ipa01:88 weight 1 maxconn 16384
 {% if env == "production" %}
-    # server  ipa02 ipa02:88 weight 1 maxconn 16384
+    server  ipa02 ipa02:88 weight 1 maxconn 16384
 {% endif %}
 
 frontend oci-candidate-registry-frontend