fickit: Add QA platform
This commit is contained in:
parent
bbe2072b4f
commit
e000778696
@ -4,6 +4,7 @@
|
|||||||
172.17.0.3 checker
|
172.17.0.3 checker
|
||||||
172.17.0.4 db
|
172.17.0.4 db
|
||||||
172.17.0.5 generator
|
172.17.0.5 generator
|
||||||
|
172.17.0.6 qa
|
||||||
|
|
||||||
10.10.10.2 phobos
|
10.10.10.2 phobos
|
||||||
|
|
||||||
|
@ -224,4 +224,6 @@ server {
|
|||||||
proxy_set_header X-FIC-Team $team;
|
proxy_set_header X-FIC-Team $team;
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include /etc/nginx/conf.d/*.fic-conf;
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,18 @@ onboot:
|
|||||||
- name: eth2
|
- name: eth2
|
||||||
bindNS:
|
bindNS:
|
||||||
net: /run/netns/synchro
|
net: /run/netns/synchro
|
||||||
|
- name: qa-ip-setup
|
||||||
|
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||||
|
command: ["/bin/sh", "-c", "ip a add 10.10.10.1/29 dev eth1; ip link set eth1 up; ip a add 172.17.0.6/24 dev vethin-qa; ip link set vethin-qa up" ]
|
||||||
|
net: new
|
||||||
|
runtime:
|
||||||
|
interfaces:
|
||||||
|
- name: eth1
|
||||||
|
- name: vethin-qa
|
||||||
|
add: veth
|
||||||
|
peer: veth-qa
|
||||||
|
bindNS:
|
||||||
|
net: /run/netns/fic-qa
|
||||||
- name: admin-ip-setup
|
- name: admin-ip-setup
|
||||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||||
#command: ["/bin/sh", "-c", "ip link add link eth3 name adminiface type vlan id 99; ip a add 172.16.99.219/24 dev adminiface; ip link set eth3 up; ip link set adminiface up; ip r add default via 172.16.99.1; ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 172.16.99.1;" ]
|
#command: ["/bin/sh", "-c", "ip link add link eth3 name adminiface type vlan id 99; ip a add 172.16.99.219/24 dev adminiface; ip link set eth3 up; ip link set adminiface up; ip r add default via 172.16.99.1; ip a add 172.17.0.2/24 dev vethin-admin; ip link set vethin-admin up; ping -W 10 -c 1 172.16.99.1;" ]
|
||||||
@ -104,7 +116,7 @@ onboot:
|
|||||||
net: /run/netns/db
|
net: /run/netns/db
|
||||||
- name: bridge-setup
|
- name: bridge-setup
|
||||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||||
command: ["/bin/sh", "-c", "ip a add 172.17.0.1/24 dev br0; ip link set veth-admin master br0; ip link set veth-checker master br0; ip link set veth-generator master br0; ip link set veth-db master br0; ip link set br0 up; ip link set veth-admin up; ip link set veth-checker up; ip link set veth-generator up; ip link set veth-db up;" ]
|
command: ["/bin/sh", "-c", "ip a add 172.17.0.1/24 dev br0; ip link set veth-admin master br0; ip link set veth-checker master br0; ip link set veth-generator master br0; ip link set veth-db master br0; ip link set veth-qa master br0; ip link set br0 up; ip link set veth-admin up; ip link set veth-checker up; ip link set veth-generator up; ip link set veth-db up; ip link set veth-qa up;" ]
|
||||||
runtime:
|
runtime:
|
||||||
interfaces:
|
interfaces:
|
||||||
- name: br0
|
- name: br0
|
||||||
@ -284,6 +296,21 @@ services:
|
|||||||
- /var/lib/fic/generator
|
- /var/lib/fic/generator
|
||||||
- /var/lib/fic/settingsdist
|
- /var/lib/fic/settingsdist
|
||||||
- /var/lib/fic/teams
|
- /var/lib/fic/teams
|
||||||
|
- name: fic-qa
|
||||||
|
image: nemunaire/fic-qa:latest
|
||||||
|
env:
|
||||||
|
- MYSQL_HOST=db
|
||||||
|
- MYSQL_PASSWORD=fic
|
||||||
|
binds:
|
||||||
|
- /etc/hosts:/etc/hosts:ro
|
||||||
|
- /var/lib/fic/teams:/srv/TEAMS
|
||||||
|
net: /run/netns/fic-qa
|
||||||
|
pid: new
|
||||||
|
ipc: new
|
||||||
|
uts: new
|
||||||
|
runtime:
|
||||||
|
mkdir:
|
||||||
|
- /var/lib/fic/teams
|
||||||
- name: fic-synchro
|
- name: fic-synchro
|
||||||
image: nemunaire/rsync:a3d76b2dd0a9ad73be44dc77ad765b20d96a3285
|
image: nemunaire/rsync:a3d76b2dd0a9ad73be44dc77ad765b20d96a3285
|
||||||
command: ["/bin/ash", "/root/synchro.sh"]
|
command: ["/bin/ash", "/root/synchro.sh"]
|
||||||
|
@ -56,7 +56,7 @@ onboot:
|
|||||||
net: /run/netns/nginx
|
net: /run/netns/nginx
|
||||||
- name: frontal-ip-setup # without bonding
|
- name: frontal-ip-setup # without bonding
|
||||||
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
|
||||||
command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; ip a add 10.42.192.3/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip r add default via 10.42.192.1; ip link add link bond-frontal name internet type vlan id 4; ip link set internet up;" ]
|
command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; ip a add 10.42.192.3/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip r add default via 10.42.192.1; ip link add link bond-frontal name internet type vlan id 4; ip a add 10.10.10.2/29 dev internet; ip link set internet up;" ]
|
||||||
net: /run/netns/nginx
|
net: /run/netns/nginx
|
||||||
runtime:
|
runtime:
|
||||||
interfaces:
|
interfaces:
|
||||||
@ -334,6 +334,17 @@ files:
|
|||||||
- path: etc/nginx/fic-get-team.conf
|
- path: etc/nginx/fic-get-team.conf
|
||||||
source: configs/nginx/get-team/oidc.conf
|
source: configs/nginx/get-team/oidc.conf
|
||||||
mode: "0400"
|
mode: "0400"
|
||||||
|
- path: etc/nginx/conf.d/qa.fic-conf
|
||||||
|
contents: |
|
||||||
|
location /qa {
|
||||||
|
include fic-get-team.conf;
|
||||||
|
|
||||||
|
proxy_pass http://deimos:8083;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-FIC-Team $team;
|
||||||
|
proxy_redirect off;
|
||||||
|
}
|
||||||
|
mode: "0400"
|
||||||
|
|
||||||
- path: etc/dex/config.auth.yaml
|
- path: etc/dex/config.auth.yaml
|
||||||
source: configs/dex.yaml
|
source: configs/dex.yaml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user