starlingx/integ
Code Issues Proposed changes

Refactor patches for haproxy package.

Browse Source 
Use haproxy-config package to package script and service file for
haproxy package.
Create patches sub-folder and move patches file from haproxy/haproxy
folder to this sub-folder.
Refactor haproxy-service-file.patch &
haproxy-spec-add-init-script.patch
as we use haproxy-config to package related files.
Merged meta_add_support_for_tpm.patch &
spec-add-haproxy-env-var-patch.patch
to spec-include-TiS-changes.patch
(renamed from spec-include-TiS-config.patch) as they just includes
adding source code patches.

Deployment test and ping test between VMs pass
config and script files check pass.

Story: 2003768
Task: 27584
Depends-on: https://review.openstack.org/#/c/614709/

Change-Id: I08fd8aa662533f4ce379f352ba9bab7616c905f5
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
zhipengl
2018-11-01 23:58:29 +08:00
committed by zhipeng liu
parent 786efe3893
commit 6db227d7c9
20 changed files with 125 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
base/haproxy/files/haproxy.cfg Normal file
View File

@@ -0,0 +1,80 @@
# this config needs haproxy-1.1.28 or haproxy-1.2.1
global
log 127.0.0.1 local0
log 127.0.0.1 local1 notice
#log loghost local0 info
maxconn 4096
chroot /usr/share/haproxy
uid 99
gid 99
daemon
#debug
#quiet
defaults
log global
mode http
option httplog
option dontlognull
retries 3
option redispatch
maxconn 2000
timeout connect 5000
timeout client 50000
timeout server 50000
listen appli1-rewrite 0.0.0.0:10001
cookie SERVERID rewrite
balance roundrobin
server app1_1 192.168.34.23:8080 cookie app1inst1 check inter 2000 rise 2 fall 5
server app1_2 192.168.34.32:8080 cookie app1inst2 check inter 2000 rise 2 fall 5
server app1_3 192.168.34.27:8080 cookie app1inst3 check inter 2000 rise 2 fall 5
server app1_4 192.168.34.42:8080 cookie app1inst4 check inter 2000 rise 2 fall 5
listen appli2-insert 0.0.0.0:10002
option httpchk
balance roundrobin
cookie SERVERID insert indirect nocache
server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
capture cookie vgnvisitor= len 32
option httpclose # disable keep-alive
rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address
listen appli3-relais 0.0.0.0:10003
dispatch 192.168.135.17:80
listen appli4-backup 0.0.0.0:10004
option httpchk /index.html
option persist
balance roundrobin
server inst1 192.168.114.56:80 check inter 2000 fall 3
server inst2 192.168.114.56:81 check inter 2000 fall 3 backup
listen ssl-relay 0.0.0.0:8443
option ssl-hello-chk
balance source
server inst1 192.168.110.56:443 check inter 2000 fall 3
server inst2 192.168.110.57:443 check inter 2000 fall 3
server back1 192.168.120.58:443 backup
listen appli5-backup 0.0.0.0:10005
option httpchk *
balance roundrobin
cookie SERVERID insert indirect nocache
server inst1 192.168.114.56:80 cookie server01 check inter 2000 fall 3
server inst2 192.168.114.56:81 cookie server02 check inter 2000 fall 3
server inst3 192.168.114.57:80 backup check inter 2000 fall 3
capture cookie ASPSESSION len 32
timeout server 20000
option httpclose # disable keep-alive
option checkcache # block response if set-cookie & cacheable
rspidel ^Set-cookie:\ IP= # do not let this cookie tell our internal IP address
errorloc 502 http://192.168.114.58/error502.html
errorfile 503 /etc/haproxy/errors/503.http