Merge pull request #22 from r4f4/haproxy-domain-ci

haproxy: accept hostnames ending with `.ci`

Author: andymcc

libvirt/haproxy/haproxy_C155F2U31.cfg

@@ -57,15 +57,27 @@ frontend api-all
     acl 00-api req_ssl_sni -m end .libvirt-ppc64le-1-0
     use_backend masters-00 if 00-api
 
+    acl 00-api-ci req_ssl_sni -m end .libvirt-ppc64le-1-0.ci
+    use_backend masters-00 if 00-api-ci
+
     acl 01-api req_ssl_sni -m end .libvirt-ppc64le-1-1
     use_backend masters-01 if 01-api
 
+    acl 01-api-ci req_ssl_sni -m end .libvirt-ppc64le-1-1.ci
+    use_backend masters-01 if 01-api-ci
+
     acl 02-api req_ssl_sni -m end .libvirt-ppc64le-1-2
     use_backend masters-02 if 02-api
 
+    acl 02-api-ci req_ssl_sni -m end .libvirt-ppc64le-1-2.ci
+    use_backend masters-02 if 02-api-ci
+
     acl 03-api req_ssl_sni -m end .libvirt-ppc64le-1-3
     use_backend masters-03 if 03-api
 
+    acl 03-api-ci req_ssl_sni -m end .libvirt-ppc64le-1-3.ci
+    use_backend masters-03 if 03-api-ci
+
 #---------------------------------------------------------------------
 # HTTP frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -76,15 +88,27 @@ frontend http-all
     acl 00-http hdr(host) -m end .libvirt-ppc64le-1-0
     use_backend http-workers-00 if 00-http
 
+    acl 00-http-ci hdr(host) -m end .libvirt-ppc64le-1-0.ci
+    use_backend http-workers-00 if 00-http-ci
+
     acl 01-http hdr(host) -m end .libvirt-ppc64le-1-1
     use_backend http-workers-01 if 01-http
 
+    acl 01-http-ci hdr(host) -m end .libvirt-ppc64le-1-1.ci
+    use_backend http-workers-01 if 01-http-ci
+
     acl 02-http hdr(host) -m end .libvirt-ppc64le-1-2
     use_backend http-workers-02 if 02-http
 
+    acl 02-http-ci hdr(host) -m end .libvirt-ppc64le-1-2.ci
+    use_backend http-workers-02 if 02-http-ci
+
     acl 03-http hdr(host) -m end .libvirt-ppc64le-1-3
     use_backend http-workers-03 if 03-http
 
+    acl 03-http-ci hdr(host) -m end .libvirt-ppc64le-1-3.ci
+    use_backend http-workers-03 if 03-http-ci
+
 #---------------------------------------------------------------------
 # HTTPS frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -100,15 +124,27 @@ frontend https-all
     acl 00-https req_ssl_sni -m end .libvirt-ppc64le-1-0
     use_backend https-workers-00 if 00-https
 
+    acl 00-https-ci req_ssl_sni -m end .libvirt-ppc64le-1-0.ci
+    use_backend https-workers-00 if 00-https-ci
+
     acl 01-https req_ssl_sni -m end .libvirt-ppc64le-1-1
     use_backend https-workers-01 if 01-https
 
+    acl 01-https-ci req_ssl_sni -m end .libvirt-ppc64le-1-1.ci
+    use_backend https-workers-01 if 01-https-ci
+
     acl 02-https req_ssl_sni -m end .libvirt-ppc64le-1-2
     use_backend https-workers-02 if 02-https
 
+    acl 02-https-ci req_ssl_sni -m end .libvirt-ppc64le-1-2.ci
+    use_backend https-workers-02 if 02-https-ci
+
     acl 03-https req_ssl_sni -m end .libvirt-ppc64le-1-3
     use_backend https-workers-03 if 03-https
 
+    acl 03-https-ci req_ssl_sni -m end .libvirt-ppc64le-1-3.ci
+    use_backend https-workers-03 if 03-https-ci
+
 #---------------------------------------------------------------------
 # Master node backends for serving API traffic
 #---------------------------------------------------------------------

libvirt/haproxy/haproxy_C155F2U33.cfg

@@ -57,15 +57,27 @@ frontend api-all
     acl 00-api req_ssl_sni -m end .libvirt-ppc64le-0-0
     use_backend masters-00 if 00-api
 
+    acl 00-api-ci req_ssl_sni -m end .libvirt-ppc64le-0-0.ci
+    use_backend masters-00 if 00-api-ci
+
     acl 01-api req_ssl_sni -m end .libvirt-ppc64le-0-1
     use_backend masters-01 if 01-api
 
+    acl 01-api-ci req_ssl_sni -m end .libvirt-ppc64le-0-1.ci
+    use_backend masters-01 if 01-api-ci
+
     acl 02-api req_ssl_sni -m end .libvirt-ppc64le-0-2
     use_backend masters-02 if 02-api
 
+    acl 02-api-ci req_ssl_sni -m end .libvirt-ppc64le-0-2.ci
+    use_backend masters-02 if 02-api-ci
+
     acl 03-api req_ssl_sni -m end .libvirt-ppc64le-0-3
     use_backend masters-03 if 03-api
 
+    acl 03-api-ci req_ssl_sni -m end .libvirt-ppc64le-0-3.ci
+    use_backend masters-03 if 03-api-ci
+
 #---------------------------------------------------------------------
 # HTTP frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -77,15 +89,27 @@ frontend http-all
     acl 00-http hdr(host) -m end .libvirt-ppc64le-0-0
     use_backend http-workers-00 if 00-http
 
+    acl 00-http-ci hdr(host) -m end .libvirt-ppc64le-0-0.ci
+    use_backend http-workers-00 if 00-http-ci
+
     acl 01-http hdr(host) -m end .libvirt-ppc64le-0-1
     use_backend http-workers-01 if 01-http
 
+    acl 01-http-ci hdr(host) -m end .libvirt-ppc64le-0-1.ci
+    use_backend http-workers-01 if 01-http-ci
+
     acl 02-http hdr(host) -m end .libvirt-ppc64le-0-2
     use_backend http-workers-02 if 02-http
 
+    acl 02-http-ci hdr(host) -m end .libvirt-ppc64le-0-2.ci
+    use_backend http-workers-02 if 02-http-ci
+
     acl 03-http hdr(host) -m end .libvirt-ppc64le-0-3
     use_backend http-workers-03 if 03-http
 
+    acl 03-http-ci hdr(host) -m end .libvirt-ppc64le-0-3.ci
+    use_backend http-workers-03 if 03-http-ci
+
 #---------------------------------------------------------------------
 # HTTPS frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -101,15 +125,27 @@ frontend https-all
     acl 00-https req_ssl_sni -m end .libvirt-ppc64le-0-0
     use_backend https-workers-00 if 00-https
 
+    acl 00-https-ci req_ssl_sni -m end .libvirt-ppc64le-0-0.ci
+    use_backend https-workers-00 if 00-https-ci
+
     acl 01-https req_ssl_sni -m end .libvirt-ppc64le-0-1
     use_backend https-workers-01 if 01-https
 
+    acl 01-https-ci req_ssl_sni -m end .libvirt-ppc64le-0-1.ci
+    use_backend https-workers-01 if 01-https-ci
+
     acl 02-https req_ssl_sni -m end .libvirt-ppc64le-0-2
     use_backend https-workers-02 if 02-https
 
+    acl 02-https-ci req_ssl_sni -m end .libvirt-ppc64le-0-2.ci
+    use_backend https-workers-02 if 02-https-ci
+
     acl 03-https req_ssl_sni -m end .libvirt-ppc64le-0-3
     use_backend https-workers-03 if 03-https
 
+    acl 03-https-ci req_ssl_sni -m end .libvirt-ppc64le-0-3.ci
+    use_backend https-workers-03 if 03-https-ci
+
 #---------------------------------------------------------------------
 # Master node backends for serving API traffic
 #---------------------------------------------------------------------

libvirt/haproxy/haproxy_C155F2U35.cfg

@@ -57,15 +57,27 @@ frontend api-all
     acl 00-api req_ssl_sni -m end .libvirt-ppc64le-2-0
     use_backend masters-00 if 00-api
 
+    acl 00-api-ci req_ssl_sni -m end .libvirt-ppc64le-2-0.ci
+    use_backend masters-00 if 00-api-ci
+
     acl 01-api req_ssl_sni -m end .libvirt-ppc64le-2-1
     use_backend masters-01 if 01-api
 
+    acl 01-api-ci req_ssl_sni -m end .libvirt-ppc64le-2-1.ci
+    use_backend masters-01 if 01-api-ci
+
     acl 02-api req_ssl_sni -m end .libvirt-ppc64le-2-2
     use_backend masters-02 if 02-api
 
+    acl 02-api-ci req_ssl_sni -m end .libvirt-ppc64le-2-2.ci
+    use_backend masters-02 if 02-api-ci
+
     acl 03-api req_ssl_sni -m end .libvirt-ppc64le-2-3
     use_backend masters-03 if 03-api
 
+    acl 03-api-ci req_ssl_sni -m end .libvirt-ppc64le-2-3.ci
+    use_backend masters-03 if 03-api-ci
+
 #---------------------------------------------------------------------
 # HTTP frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -76,15 +88,27 @@ frontend http-all
     acl 00-http hdr(host) -m end .libvirt-ppc64le-2-0
     use_backend http-workers-00 if 00-http
 
+    acl 00-http-ci hdr(host) -m end .libvirt-ppc64le-2-0.ci
+    use_backend http-workers-00 if 00-http-ci
+
     acl 01-http hdr(host) -m end .libvirt-ppc64le-2-1
     use_backend http-workers-01 if 01-http
 
+    acl 01-http-ci hdr(host) -m end .libvirt-ppc64le-2-1.ci
+    use_backend http-workers-01 if 01-http-ci
+
     acl 02-http hdr(host) -m end .libvirt-ppc64le-2-2
     use_backend http-workers-02 if 02-http
 
+    acl 02-http-ci hdr(host) -m end .libvirt-ppc64le-2-2.ci
+    use_backend http-workers-02 if 02-http-ci
+
     acl 03-http hdr(host) -m end .libvirt-ppc64le-2-3
     use_backend http-workers-03 if 03-http
 
+    acl 03-http-ci hdr(host) -m end .libvirt-ppc64le-2-3.ci
+    use_backend http-workers-03 if 03-http-ci
+
 #---------------------------------------------------------------------
 # HTTPS frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -100,15 +124,27 @@ frontend https-all
     acl 00-https req_ssl_sni -m end .libvirt-ppc64le-2-0
     use_backend https-workers-00 if 00-https
 
+    acl 00-https-ci req_ssl_sni -m end .libvirt-ppc64le-2-0.ci
+    use_backend https-workers-00 if 00-https-ci
+
     acl 01-https req_ssl_sni -m end .libvirt-ppc64le-2-1
     use_backend https-workers-01 if 01-https
 
+    acl 01-https-ci req_ssl_sni -m end .libvirt-ppc64le-2-1.ci
+    use_backend https-workers-01 if 01-https-ci
+
     acl 02-https req_ssl_sni -m end .libvirt-ppc64le-2-2
     use_backend https-workers-02 if 02-https
 
+    acl 02-https-ci req_ssl_sni -m end .libvirt-ppc64le-2-2.ci
+    use_backend https-workers-02 if 02-https-ci
+
     acl 03-https req_ssl_sni -m end .libvirt-ppc64le-2-3
     use_backend https-workers-03 if 03-https
 
+    acl 03-https-ci req_ssl_sni -m end .libvirt-ppc64le-2-3.ci
+    use_backend https-workers-03 if 03-https-ci
+
 #---------------------------------------------------------------------
 # Master node backends for serving API traffic
 #---------------------------------------------------------------------

libvirt/haproxy/haproxy_lnxocp01.cfg

@@ -57,18 +57,33 @@ frontend api-all
     acl 00-api req_ssl_sni -m end .libvirt-s390x-0-0
     use_backend masters-00 if 00-api
 
+    acl 00-api-ci req_ssl_sni -m end .libvirt-s390x-0-0.ci
+    use_backend masters-00 if 00-api-ci
+
     acl 01-api req_ssl_sni -m end .libvirt-s390x-0-1
     use_backend masters-01 if 01-api
 
+    acl 01-api-ci req_ssl_sni -m end .libvirt-s390x-0-1.ci
+    use_backend masters-01 if 01-api-ci
+
     acl 02-api req_ssl_sni -m end .libvirt-s390x-0-2
     use_backend masters-02 if 02-api
 
+    acl 02-api-ci req_ssl_sni -m end .libvirt-s390x-0-2.ci
+    use_backend masters-02 if 02-api-ci
+
     acl 03-api req_ssl_sni -m end .libvirt-s390x-0-3
     use_backend masters-03 if 03-api
 
+    acl 03-api-ci req_ssl_sni -m end .libvirt-s390x-0-3.ci
+    use_backend masters-03 if 03-api-ci
+
     acl 04-api req_ssl_sni -m end .libvirt-s390x-0-4
     use_backend masters-04 if 04-api
 
+    acl 04-api-ci req_ssl_sni -m end .libvirt-s390x-0-4.ci
+    use_backend masters-04 if 04-api-ci
+
 #---------------------------------------------------------------------
 # HTTP frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -80,18 +95,33 @@ frontend http-all
     acl 00-http hdr(host) -m end .libvirt-s390x-0-0
     use_backend http-workers-00 if 00-http
 
+    acl 00-http-ci hdr(host) -m end .libvirt-s390x-0-0.ci
+    use_backend http-workers-00 if 00-http-ci
+
     acl 01-http hdr(host) -m end .libvirt-s390x-0-1
     use_backend http-workers-01 if 01-http
 
+    acl 01-http-ci hdr(host) -m end .libvirt-s390x-0-1.ci
+    use_backend http-workers-01 if 01-http-ci
+
     acl 02-http hdr(host) -m end .libvirt-s390x-0-2
     use_backend http-workers-02 if 02-http
 
+    acl 02-http-ci hdr(host) -m end .libvirt-s390x-0-2.ci
+    use_backend http-workers-02 if 02-http-ci
+
     acl 03-http hdr(host) -m end .libvirt-s390x-0-3
     use_backend http-workers-03 if 03-http
 
+    acl 03-http-ci hdr(host) -m end .libvirt-s390x-0-3.ci
+    use_backend http-workers-03 if 03-http-ci
+
     acl 04-http hdr(host) -m end .libvirt-s390x-0-4
     use_backend http-workers-04 if 04-http
 
+    acl 04-http-ci hdr(host) -m end .libvirt-s390x-0-4.ci
+    use_backend http-workers-04 if 04-http-ci
+
 #---------------------------------------------------------------------
 # HTTPS frontend which proxys to the created worker nodes
 #---------------------------------------------------------------------
@@ -107,18 +137,33 @@ frontend https-all
     acl 00-https req_ssl_sni -m end .libvirt-s390x-0-0
     use_backend https-workers-00 if 00-https
 
+    acl 00-https-ci req_ssl_sni -m end .libvirt-s390x-0-0.ci
+    use_backend https-workers-00 if 00-https-ci
+
     acl 01-https req_ssl_sni -m end .libvirt-s390x-0-1
     use_backend https-workers-01 if 01-https
 
+    acl 01-https-ci req_ssl_sni -m end .libvirt-s390x-0-1.ci
+    use_backend https-workers-01 if 01-https-ci
+
     acl 02-https req_ssl_sni -m end .libvirt-s390x-0-2
     use_backend https-workers-02 if 02-https
 
+    acl 02-https-ci req_ssl_sni -m end .libvirt-s390x-0-2.ci
+    use_backend https-workers-02 if 02-https-ci
+
     acl 03-https req_ssl_sni -m end .libvirt-s390x-0-3
     use_backend https-workers-03 if 03-https
 
+    acl 03-https-ci req_ssl_sni -m end .libvirt-s390x-0-3.ci
+    use_backend https-workers-03 if 03-https-ci
+
     acl 04-https req_ssl_sni -m end .libvirt-s390x-0-4
     use_backend https-workers-04 if 04-https
 
+    acl 04-https-ci req_ssl_sni -m end .libvirt-s390x-0-4.ci
+    use_backend https-workers-04 if 04-https-ci
+
 #---------------------------------------------------------------------
 # Master node backends for serving API traffic
 #---------------------------------------------------------------------