ops / yoho-ansible-roles · Commits

Go to a project

Authored by chunhua.zhang
Commit 7f664901e3fdbfe8e96e549983f00b05c1a35fd2 1 parent 625a2f85

add

Inline Side-by-side
Showing 1 changed file with 3 additions and 7 deletions
@@ -22,9 +22,9 @@ db_ordersplit_1_read: 10.66.106.6 @@ -22,9 +22,9 @@ db_ordersplit_1_read: 10.66.106.6
22 db_ordersplit_2_write: 10.66.0.81 22 db_ordersplit_2_write: 10.66.0.81
23 db_ordersplit_2_read: 10.66.106.9 23 db_ordersplit_2_read: 10.66.106.9
24 db_ordersplit_3_write: 10.66.0.98 24 db_ordersplit_3_write: 10.66.0.98
25 -db_ordersplit_3_read: 4.4.4.4  
26 -db_ordersplit_4_write: 2.2.2.2  
27 -db_ordersplit_4_read: 3.3.3.3 25 +db_ordersplit_3_read: 10.66.106.15
  26 +db_ordersplit_4_write: 10.66.0.121
  27 +db_ordersplit_4_read: 10.66.106.16
28 28
29 # java inner load balancer 29 # java inner load balancer
30 java: 30 java:
@@ -51,9 +51,5 @@ zookeeper: @@ -51,9 +51,5 @@ zookeeper:
51 - 10.66.202.2 51 - 10.66.202.2
52 52
53 # for test 53 # for test
54 -<<<<<<< HEAD  
55 db_test_read: 19.9.9.85 54 db_test_read: 19.9.9.85
56 db_test_write: 19.9.9.111 55 db_test_write: 19.9.9.111
57 -=======  
58 -db_test_only: 5.5.5.5  
59 ->>>>>>> ea876b39b7a782415b812c5e84612d2b9bce4d8b