edit config for haproxy

GeunSam2 · Sep 3, 2020 · 25dd9f8 · 25dd9f8
1 parent a49db9f
commit 25dd9f8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 69 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 SERVICE_N := sampledb
 TAG := v1
 IMAGE_NAME_BASE := geunsam2/mha-$(SERVICE_N)
-MYSQL_PASS := admin123!@#
 
 .PHONY: help build push clean
 

diff --git a/Makefile.back b/Makefile.back
diff --git a/conf/sampledb/haproxy.json b/conf/sampledb/haproxy.json
@@ -1,5 +1,5 @@
 {
-  "id": "%your_service_id%,",
+  "id": "%your_service_id%",
   "backoffFactor": 1.15,
   "backoffSeconds": 1,
   "constraints": [
@@ -8,18 +8,16 @@
   "container": {
     "portMappings": [
       {
-        "containerPort": 33406,
-        "hostPort": %replace_here%,
+        "containerPort": %port_for_master_group%,
+        "hostPort": %port_for_master_group%,
         "protocol": "tcp",
-        "servicePort": %replace_here%,
-        "name": "%replace_here%"
+        "name": "master_group"
       },
       {
-        "containerPort": 33408,
-        "hostPort": %replace_here%,
+        "containerPort": %port_for_slave_group%,
+        "hostPort": %port_for_slave_group%,
         "protocol": "tcp",
-        "servicePort": %replace_here%,
-        "name": "%replace_here%"
+        "name": "slave_group"
       }
     ],
     "type": "DOCKER",
@@ -31,11 +29,11 @@
       "parameters": []
     }
   },
-  "cpus": 0.5,
+  "cpus": %cpu_limit%,
   "disk": 0,
   "instances": 1,
   "maxLaunchDelaySeconds": 300,
-  "mem": 512, 
+  "mem": %mem_limit%, 
   "gpus": 0,
   "networks": [
     {

diff --git a/conf/sampledb/haproxy1.cfg b/conf/sampledb/haproxy1.cfg
@@ -9,17 +9,17 @@ defaults
     maxconn     10000
     retries     3
 frontend master
-	bind *:33406
-	default_backend master_13306
-backend master_13306
+	bind *:%port_for_master_group%
+	default_backend master_back
+backend master_back
 	mode tcp
 	balance roundrobin
-	server master1 128.11.1.69:13306  check
+	server master %master_1_ip%:%master_1_port%  check
 frontend slave
-	bind *:33408
-	default_backend slave_13308
-backend slave_13308
+	bind *:%port_for_slave_group%
+	default_backend slave_back
+backend slave_back
 	mode tcp
 	balance roundrobin
-	server slave1 128.11.1.68:13308  check
-	server slave2 128.11.1.69:13308  check backup
+	server slave1 %slave_1_ip%:%slave_1_port%  check
+	server slave2 %slave_2_ip%:%slave_2_port%  check
diff --git a/conf/sampledb/haproxy2.cfg b/conf/sampledb/haproxy2.cfg
@@ -9,17 +9,17 @@ defaults
     maxconn     10000
     retries     3
 frontend master
-	bind *:33406
-	default_backend master_13306
-backend master_13306
-	mode tcp
-	balance roundrobin
-	server master1 128.11.1.68:13306  check
+        bind *:%port_for_master_group%
+        default_backend master_back
+backend master_back
+        mode tcp
+        balance roundrobin
+        server master %master_2_ip%:%master_2_port%  check
 frontend slave
-	bind *:33408
-	default_backend slave_13308
-backend slave_13308
-	mode tcp
-	balance roundrobin
-	server slave1 128.11.1.68:13308  check
-	server slave2 128.11.1.69:13308  check backup
+        bind *:%port_for_slave_group%
+        default_backend slave_back
+backend slave_back
+        mode tcp
+        balance roundrobin
+        server slave1 %slave_1_ip%:%slave_1_port%  check
+        server slave2 %slave_2_ip%:%slave_2_port%  check