update files to put basics for proxy13/proxy14 into being

inventory/host_vars/proxy05.fedoraproject.org

@@ -10,8 +10,8 @@ postfix_group: vpn
 nrpe_procs_warn: 1200
 nrpe_procs_crit: 1400
 
-nm: 255.255.254.0
+#nm: 255.255.254.0
-gw: 185.141.165.1
+#gw: 185.141.165.1
-dns: 8.8.8.8
+#dns: 8.8.8.8
-eth0_ip: 185.141.165.254
+#eth0_ip: 185.141.165.254
-eth0_nm: 255.255.254.0
+#eth0_nm: 255.255.254.0

inventory/host_vars/proxy13.fedoraproject.org

@@ -0,0 +1,27 @@
+---
+nm: 255.255.255.192
+gw: 204.85.14.62
+dns: 8.8.8.8
+
+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/
+
+vmhost: virthost-rdu01.fedoraproject.org
+volgroup: /dev/vg_guests
+
+eth0_ip: 204.85.14.3
+eth0_nm: 255.255.255.192
+has_ipv6: no
+
+# This is consumed by the roles/fedora-web/main role
+sponsor: redhat
+datacenter: rdu
+postfix_group: vpn
+
+nrpe_procs_warn: 1200
+nrpe_procs_crit: 1400
+
+mem_size: 16384
+num_cpus: 8
+
+collectd_graphite: True

inventory/host_vars/proxy14.fedoraproject.org

@@ -0,0 +1,27 @@
+---
+nm: 255.255.255.0
+gw: 8.43.85.254
+dns: 8.8.8.8
+
+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/
+
+vmhost: virthost-rdu01.fedoraproject.org
+volgroup: /dev/vg_guests
+
+eth0_ip: 8.43.85.66
+eth0_nm: 255.255.255.0
+has_ipv6: no
+
+# This is consumed by the roles/fedora-web/main role
+sponsor: redhat
+datacenter: rdu-cc
+postfix_group: vpn
+
+nrpe_procs_warn: 1200
+nrpe_procs_crit: 1400
+
+mem_size: 16384
+num_cpus: 8
+
+collectd_graphite: True

inventory/inventory

@@ -586,6 +586,8 @@ proxy09.fedoraproject.org
 proxy10.phx2.fedoraproject.org
 proxy11.fedoraproject.org
 proxy12.fedoraproject.org
+proxy13.fedoraproject.org
+proxy14.fedoraproject.org
 
 [proxies-stg]
 proxy01.stg.phx2.fedoraproject.org

roles/base/files/syncHttpLogs.sh

@@ -38,6 +38,8 @@ syncHttpLogs proxy08.vpn.fedoraproject.org
 syncHttpLogs proxy10.phx2.fedoraproject.org
 syncHttpLogs proxy11.vpn.fedoraproject.org
 syncHttpLogs proxy12.vpn.fedoraproject.org
+syncHttpLogs proxy13.vpn.fedoraproject.org
+syncHttpLogs proxy14.vpn.fedoraproject.org
 syncHttpLogs proxy01.stg.phx2.fedoraproject.org
 syncHttpLogs fas01.phx2.fedoraproject.org
 syncHttpLogs fas02.phx2.fedoraproject.org

roles/mediawiki/templates/LocalSettings.php.fp.j2

@@ -437,6 +437,14 @@ $wgSquidServersNoPurge = array(
     "152.19.134.198",
     "192.168.1.13",
 
+    # proxy13
+    "204.85.14.3",
+    "192.168.1.158",
+
+    # proxy14
+    "8.43.85.66",
+    "192.168.1.159",
+
 {% endif %}
 );
 # This setting is used to send PURGE requests to varnish on reverse proxies upon page changes
@@ -467,6 +475,10 @@ $wgSquidServers = array(
     "192.168.1.37:6081",
     # proxy12
     "192.168.1.13:6081",
+    # proxy13
+    "192.168.1.158:6081",
+    # proxy14
+    "192.168.1.159:6081",
 {% endif %}
 );
 $wgSquidMaxage = 432000;

roles/mediawiki123/templates/LocalSettings.php.fp.j2

@@ -379,6 +379,14 @@ $wgSquidServersNoPurge = array(
     "152.19.134.198",
     "192.168.1.13",
 
+    # proxy13
+    "204.85.14.3",
+    "192.168.1.158",
+
+    # proxy14
+    "8.43.85.66",
+    "192.168.1.159",
+
 {% endif %}
 );
 # This setting is used to send PURGE requests to varnish on reverse proxies upon page changes
@@ -405,6 +413,12 @@ $wgSquidServers = array(
     "10.5.126.51:6081",
     # proxy11
     "192.168.1.37:6081",
+    # proxy12
+    "192.168.1.13:6081",
+    # proxy13
+    "192.168.1.158:6081",
+    # proxy14
+    "192.168.1.159:6081",
 {% endif %}
 );
 $wgSquidMaxage = 432000;

roles/nagios/server/files/nagios/hosts/proxy13.cfg

@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy13
+  alias                        proxy13.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy13.fedoraproject.org
+  parents                      virthost-rdu01
+}

roles/nagios/server/files/nagios/hosts/proxy14.cfg

@@ -0,0 +1,7 @@
+define host {
+  host_name                    proxy14
+  alias                        proxy14.fedoraproject.org
+  use                          defaulttemplate
+  address                      proxy14.fedoraproject.org
+  parents                      virthost-cc-rdu01
+}

roles/nagios/server/files/nagios/hosts/virthost-cc-rdu01.cfg

@@ -0,0 +1,7 @@
+define host {
+  host_name                    virthost-cc-rdu01
+  alias                        virthost-cc-rdu01.fedoraproject.org
+  use                          defaulttemplate
+  address                      virthost-cc-rdu01.fedoraproject.org
+  parents                      fwsm01-gw
+}

roles/nagios/server/files/nagios/hosts/virthost-rdu01.cfg

@@ -0,0 +1,7 @@
+define host {
+  host_name                    virthost-rdu01
+  alias                        virthost-rdu01.fedoraproject.org
+  use                          defaulttemplate
+  address                      virthost-rdu01.fedoraproject.org
+  parents                      fwsm01-gw
+}

roles/openvpn/server/files/ccd/proxy13.fedoraproject.org

@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.158 192.168.0.158

roles/openvpn/server/files/ccd/proxy14.fedoraproject.org

@@ -0,0 +1,2 @@
+# ifconfig-push actualIP PtPIP
+ifconfig-push 192.168.1.159 192.168.0.159