Skip to content

Commit 85b677f

Browse files
committed
bugfix typo & add etcd yaml
1 parent c9291c2 commit 85b677f

File tree

11 files changed

+186
-58
lines changed

11 files changed

+186
-58
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
etcd:
3+
image: quay.io/coreos/etcd:v3.5.8
4+
container_name: etcd
5+
environment:
6+
- ETCD_NAME=etcd1
7+
- ETCD_DATA_DIR=/etcd-data
8+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://<cluster1_ip>:2380
9+
- ETCD_ADVERTISE_CLIENT_URLS=http://<cluster1_ip>:2379
10+
- ETCD_LISTEN_PEER_URLS=http://<cluster1_ip>:2380
11+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
12+
- ETCD_INITIAL_CLUSTER=etcd1=http://<cluster1_ip>:2380,etcd2=http://<cluster2_ip>:2380,etcd3=http://<cluster3_ip>:2380
13+
- ETCD_INITIAL_CLUSTER_STATE=new
14+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
15+
network_mode: host
16+
volumes:
17+
- /home/ivorysql/etcd:/etcd-data
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
etcd:
3+
image: quay.io/coreos/etcd:v3.5.8
4+
container_name: etcd
5+
environment:
6+
- ETCD_NAME=etcd2
7+
- ETCD_DATA_DIR=/etcd-data
8+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://<cluster2_ip>:2380
9+
- ETCD_ADVERTISE_CLIENT_URLS=http://<cluster2_ip>:2379
10+
- ETCD_LISTEN_PEER_URLS=http://<cluster2_ip>:2380
11+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
12+
- ETCD_INITIAL_CLUSTER=etcd1=http://<cluster1_ip>:2380,etcd2=http://<cluster2_ip>:2380,etcd3=http://<cluster3_ip>:2380
13+
- ETCD_INITIAL_CLUSTER_STATE=new
14+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
15+
network_mode: host
16+
volumes:
17+
- /home/ivorysql/etcd:/etcd-data
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
etcd:
3+
image: quay.io/coreos/etcd:v3.5.8
4+
container_name: etcd
5+
environment:
6+
- ETCD_NAME=etcd3
7+
- ETCD_DATA_DIR=/etcd-data
8+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://<cluster3_ip>:2380
9+
- ETCD_ADVERTISE_CLIENT_URLS=http://<cluster3_ip>:2379
10+
- ETCD_LISTEN_PEER_URLS=http://<cluster3_ip>:2380
11+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
12+
- ETCD_INITIAL_CLUSTER=etcd1=http://<cluster1_ip>:2380,etcd2=http://<cluster2_ip>:2380,etcd3=http://<cluster3_ip>:2380
13+
- ETCD_INITIAL_CLUSTER_STATE=new
14+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
15+
network_mode: host
16+
volumes:
17+
- /home/ivorysql/etcd:/etcd-data

docker-cluster/docker-compose/docker-compose-ivypatroni_3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
services:
2-
ivypatroni2:
2+
ivypatroni3:
33
image: ivorysql/docker-compose-ha-cluster:4.6-4.0.6-ubi8
44
restart: always
55
container_name: ivyhac3

docker-cluster/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ postgresql:
6161
ssl: 'off'
6262
logging_collector: on
6363
log_directory: 'log'
64-
unix_socket_directories: '..'
64+
ivorysql.listen_addresses: '*'
6565
6666
pg_hba:
6767
- local all all peer

docker-cluster/docker-swarm/docker-compose-swarm-ivypatroni_1.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker-cluster/docker-swarm/docker-compose-swarm-ivypatroni_2.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker-cluster/docker-swarm/docker-compose-swarm-ivypatroni_3.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: '3.8'
2+
3+
services:
4+
etcd1:
5+
image: quay.io/coreos/etcd:v3.5.8
6+
deploy:
7+
replicas: 1
8+
placement:
9+
constraints:
10+
- node.role == manager
11+
environment:
12+
- ETCD_NAME=etcd1
13+
- ETCD_DATA_DIR=/etcd-data
14+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd1:2380
15+
- ETCD_ADVERTISE_CLIENT_URLS=http://etcd1:2379
16+
- ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
17+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
18+
- ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
19+
- ETCD_INITIAL_CLUSTER_STATE=new
20+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
21+
ports:
22+
- "2379:2379"
23+
- "2380:2380"
24+
networks:
25+
- etcd-net
26+
27+
etcd2:
28+
image: quay.io/coreos/etcd:v3.5.8
29+
deploy:
30+
replicas: 1
31+
placement:
32+
constraints:
33+
- node.role == manager
34+
environment:
35+
- ETCD_NAME=etcd2
36+
- ETCD_DATA_DIR=/etcd-data
37+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd2:2380
38+
- ETCD_ADVERTISE_CLIENT_URLS=http://etcd2:2379
39+
- ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
40+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
41+
- ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
42+
- ETCD_INITIAL_CLUSTER_STATE=new
43+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
44+
networks:
45+
- etcd-net
46+
47+
etcd3:
48+
image: quay.io/coreos/etcd:v3.5.8
49+
deploy:
50+
replicas: 1
51+
placement:
52+
constraints:
53+
- node.role == manager
54+
environment:
55+
- ETCD_NAME=etcd3
56+
- ETCD_DATA_DIR=/etcd-data
57+
- ETCD_INITIAL_ADVERTISE_PEER_URLS=http://etcd3:2380
58+
- ETCD_ADVERTISE_CLIENT_URLS=http://etcd3:2379
59+
- ETCD_LISTEN_PEER_URLS=http://0.0.0.0:2380
60+
- ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
61+
- ETCD_INITIAL_CLUSTER=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
62+
- ETCD_INITIAL_CLUSTER_STATE=new
63+
- ETCD_INITIAL_CLUSTER_TOKEN=etcd-cluster
64+
networks:
65+
- etcd-net
66+
67+
networks:
68+
etcd-net:
69+
driver: overlay
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
version: '3.7'
2+
3+
services:
4+
ivypatroni1:
5+
image: ivorysql/docker-swarm-ha-cluster:4.6-4.0.6-ubi8
6+
environment:
7+
IVORYSQL_PASSWORD: 123456
8+
PATRONI_SCOPE: hgdb-cluster1
9+
PATRONI_SERVICE_NAME: ivypatroni1
10+
IVORYSQL_DB_MODE: oracle
11+
IVORYSQL_HOST_AUTH_METHOD: scram-sha-256
12+
ETCD_HOSTS: etcd1:2379,etcd2:2379,etcd3:2379
13+
IVORYSQL_HOST: ivypatroni1
14+
volumes:
15+
- /home/ivorysql/data:/var/local/ivorysql/ivorysql-4/data
16+
- /home/ivorysql/patroni:/var/local/ivorysql/ivorysql-4/patroni
17+
networks:
18+
- ivoryhac-etcd_etcd-net
19+
deploy:
20+
replicas: 1
21+
resources:
22+
limits:
23+
cpus: "0.5"
24+
memory: 512M
25+
restart_policy:
26+
condition: on-failure
27+
placement:
28+
constraints: [node.hostname == manager-node1]
29+
ports:
30+
- "5432:5432"
31+
- "1521:1521"
32+
33+
ivypatroni2:
34+
image: ivorysql/docker-swarm-ha-cluster:4.6-4.0.6-ubi8
35+
environment:
36+
IVORYSQL_PASSWORD: 123456
37+
PATRONI_SCOPE: hgdb-cluster1
38+
PATRONI_SERVICE_NAME: ivypatroni2
39+
IVORYSQL_DB_MODE: oracle
40+
IVORYSQL_HOST_AUTH_METHOD: scram-sha-256
41+
ETCD_HOSTS: etcd1:2379,etcd2:2379,etcd3:2379
42+
IVORYSQL_HOST: ivypatroni2
43+
volumes:
44+
- /home/ivorysql/data:/var/local/ivorysql/ivorysql-4/data
45+
- /home/ivorysql/patroni:/var/local/ivorysql/ivorysql-4/patroni
46+
networks:
47+
- ivoryhac-etcd_etcd-net
48+
deploy:
49+
replicas: 1
50+
resources:
51+
limits:
52+
cpus: "0.5"
53+
memory: 512M
54+
restart_policy:
55+
condition: on-failure
56+
placement:
57+
constraints: [node.hostname == manager-node2]
58+
ports:
59+
- "5433:5432"
60+
- "1522:1521"
61+
62+
networks:
63+
ivoryhac-etcd_etcd-net:
64+
external: true

0 commit comments

Comments
 (0)