Authored by chunhua.zhang

Merge branch 'master' of git.yoho.cn:ops/yoho-ansible-roles

# Conflicts:
#	inventories/az3/group_vars/all.yml
... ... @@ -22,9 +22,9 @@ db_ordersplit_1_read: 10.66.106.6
db_ordersplit_2_write: 10.66.0.81
db_ordersplit_2_read: 10.66.106.9
db_ordersplit_3_write: 10.66.0.98
db_ordersplit_3_read: 10.66.106.15
db_ordersplit_4_write: 10.66.0.121
db_ordersplit_4_read: 10.66.106.16
db_ordersplit_3_read: 4.4.4.4
db_ordersplit_4_write: 2.2.2.2
db_ordersplit_4_read: 3.3.3.3
# java inner load balancer
java:
... ... @@ -51,5 +51,9 @@ zookeeper:
- 10.66.202.2
# for test
<<<<<<< HEAD
db_test_read: 19.9.9.85
db_test_write: 19.9.9.111
=======
db_test_only: 5.5.5.5
>>>>>>> ea876b39b7a782415b812c5e84612d2b9bce4d8b
... ...