Skip to content

Commit 02a179f

Browse files
deepsm007deepsm007
authored
Merge pull request #25 from multi-arch/sshd-port
Adding 3rd Lpar configs for s390x and updating total cluster capacity
2 parents 83fc5a7 + 12d6738 commit 02a179f

File tree

6 files changed

+297
-90
lines changed

6 files changed

+297
-90
lines changed

‎libvirt/haproxy/haproxy_lnxocp01.cfg‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ frontend api-all
7878
acl 03-api-ci req_ssl_sni -m end .libvirt-s390x-0-3.ci
7979
use_backend masters-03 if 03-api-ci
8080

81-
acl 04-api req_ssl_sni -m end .libvirt-s390x-0-4
82-
use_backend masters-04 if 04-api
83-
84-
acl 04-api-ci req_ssl_sni -m end .libvirt-s390x-0-4.ci
85-
use_backend masters-04 if 04-api-ci
86-
8781
#---------------------------------------------------------------------
8882
# HTTP frontend which proxys to the created worker nodes
8983
#---------------------------------------------------------------------
@@ -116,12 +110,6 @@ frontend http-all
116110
acl 03-http-ci hdr(host) -m end .libvirt-s390x-0-3.ci
117111
use_backend http-workers-03 if 03-http-ci
118112

119-
acl 04-http hdr(host) -m end .libvirt-s390x-0-4
120-
use_backend http-workers-04 if 04-http
121-
122-
acl 04-http-ci hdr(host) -m end .libvirt-s390x-0-4.ci
123-
use_backend http-workers-04 if 04-http-ci
124-
125113
#---------------------------------------------------------------------
126114
# HTTPS frontend which proxys to the created worker nodes
127115
#---------------------------------------------------------------------
@@ -158,12 +146,6 @@ frontend https-all
158146
acl 03-https-ci req_ssl_sni -m end .libvirt-s390x-0-3.ci
159147
use_backend https-workers-03 if 03-https-ci
160148

161-
acl 04-https req_ssl_sni -m end .libvirt-s390x-0-4
162-
use_backend https-workers-04 if 04-https
163-
164-
acl 04-https-ci req_ssl_sni -m end .libvirt-s390x-0-4.ci
165-
use_backend https-workers-04 if 04-https-ci
166-
167149
#---------------------------------------------------------------------
168150
# Master node backends for serving API traffic
169151
#---------------------------------------------------------------------
@@ -195,13 +177,6 @@ backend masters-03
195177
server master1 192.168.3.11:6443 check
196178
server master2 192.168.3.12:6443 check
197179
server master3 192.168.3.13:6443 check
198-
backend masters-04
199-
mode tcp
200-
balance roundrobin
201-
server bootstrap 192.168.4.10:6443 check
202-
server master1 192.168.4.11:6443 check
203-
server master2 192.168.4.12:6443 check
204-
server master3 192.168.4.13:6443 check
205180

206181
#---------------------------------------------------------------------
207182
# Worker node backends for serving HTTP service endpoints
@@ -238,14 +213,6 @@ backend http-workers-03
238213
server master3 192.168.3.13:80 check
239214
server worker1 192.168.3.51:80 check
240215
server worker2 192.168.3.52:80 check
241-
backend http-workers-04
242-
option forwardfor except 127.0.0.0/8
243-
balance roundrobin
244-
server master1 192.168.4.11:80 check
245-
server master2 192.168.4.12:80 check
246-
server master3 192.168.4.13:80 check
247-
server worker1 192.168.4.51:80 check
248-
server worker2 192.168.4.52:80 check
249216
#---------------------------------------------------------------------
250217
# Debug node
251218
#---------------------------------------------------------------------
@@ -288,14 +255,6 @@ backend https-workers-03
288255
server master3 192.168.3.13:443 check
289256
server worker1 192.168.3.51:443 check
290257
server worker2 192.168.3.52:443 check
291-
backend https-workers-04
292-
mode tcp
293-
balance roundrobin
294-
server master1 192.168.4.11:443 check
295-
server master2 192.168.4.12:443 check
296-
server master3 192.168.4.13:443 check
297-
server worker1 192.168.4.51:443 check
298-
server worker2 192.168.4.52:443 check
299258
#---------------------------------------------------------------------
300259
# Debug node https
301260
#---------------------------------------------------------------------

‎libvirt/haproxy/haproxy_lnxocp02.cfg‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ frontend api-all
7878
acl 03-api-ci req_ssl_sni -m end .libvirt-s390x-1-3.ci
7979
use_backend masters-03 if 03-api-ci
8080

81-
acl 04-api req_ssl_sni -m end .libvirt-s390x-1-4
82-
use_backend masters-04 if 04-api
83-
84-
acl 04-api-ci req_ssl_sni -m end .libvirt-s390x-1-4.ci
85-
use_backend masters-04 if 04-api-ci
86-
8781
#---------------------------------------------------------------------
8882
# HTTP frontend which proxys to the created worker nodes
8983
#---------------------------------------------------------------------
@@ -116,12 +110,6 @@ frontend http-all
116110
acl 03-http-ci hdr(host) -m end .libvirt-s390x-1-3.ci
117111
use_backend http-workers-03 if 03-http-ci
118112

119-
acl 04-http hdr(host) -m end .libvirt-s390x-1-4
120-
use_backend http-workers-04 if 04-http
121-
122-
acl 04-http-ci hdr(host) -m end .libvirt-s390x-1-4.ci
123-
use_backend http-workers-04 if 04-http-ci
124-
125113
#---------------------------------------------------------------------
126114
# HTTPS frontend which proxys to the created worker nodes
127115
#---------------------------------------------------------------------
@@ -158,12 +146,6 @@ frontend https-all
158146
acl 03-https-ci req_ssl_sni -m end .libvirt-s390x-1-3.ci
159147
use_backend https-workers-03 if 03-https-ci
160148

161-
acl 04-https req_ssl_sni -m end .libvirt-s390x-1-4
162-
use_backend https-workers-04 if 04-https
163-
164-
acl 04-https-ci req_ssl_sni -m end .libvirt-s390x-1-4.ci
165-
use_backend https-workers-04 if 04-https-ci
166-
167149
#---------------------------------------------------------------------
168150
# Master node backends for serving API traffic
169151
#---------------------------------------------------------------------
@@ -195,13 +177,6 @@ backend masters-03
195177
server master1 192.168.3.11:6443 check
196178
server master2 192.168.3.12:6443 check
197179
server master3 192.168.3.13:6443 check
198-
backend masters-04
199-
mode tcp
200-
balance roundrobin
201-
server bootstrap 192.168.4.10:6443 check
202-
server master1 192.168.4.11:6443 check
203-
server master2 192.168.4.12:6443 check
204-
server master3 192.168.4.13:6443 check
205180

206181
#---------------------------------------------------------------------
207182
# Worker node backends for serving HTTP service endpoints
@@ -238,14 +213,6 @@ backend http-workers-03
238213
server master3 192.168.3.13:80 check
239214
server worker1 192.168.3.51:80 check
240215
server worker2 192.168.3.52:80 check
241-
backend http-workers-04
242-
option forwardfor except 127.0.0.0/8
243-
balance roundrobin
244-
server master1 192.168.4.11:80 check
245-
server master2 192.168.4.12:80 check
246-
server master3 192.168.4.13:80 check
247-
server worker1 192.168.4.51:80 check
248-
server worker2 192.168.4.52:80 check
249216
#---------------------------------------------------------------------
250217
# Debug node
251218
#---------------------------------------------------------------------
@@ -288,14 +255,6 @@ backend https-workers-03
288255
server master3 192.168.3.13:443 check
289256
server worker1 192.168.3.51:443 check
290257
server worker2 192.168.3.52:443 check
291-
backend https-workers-04
292-
mode tcp
293-
balance roundrobin
294-
server master1 192.168.4.11:443 check
295-
server master2 192.168.4.12:443 check
296-
server master3 192.168.4.13:443 check
297-
server worker1 192.168.4.51:443 check
298-
server worker2 192.168.4.52:443 check
299258
#---------------------------------------------------------------------
300259
# Debug node https
301260
#---------------------------------------------------------------------

0 commit comments

Comments
 (0)