Authored by root

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

@@ -130,15 +130,18 @@ redis.global IN A {{ redis.global } @@ -130,15 +130,18 @@ redis.global IN A {{ redis.global }
130 redis.java IN A {{ redis.java }} 130 redis.java IN A {{ redis.java }}
131 redis.gateway IN A {{ redis.gateway }} 131 redis.gateway IN A {{ redis.gateway }}
132 redis.bigdata IN A 10.66.4.156 132 redis.bigdata IN A 10.66.4.156
133 -redis.web IN A 10.66.105.49  
134 search.redis IN A {{ redis.search }} 133 search.redis IN A {{ redis.search }}
135 redis.push IN A 10.66.5.182 134 redis.push IN A 10.66.5.182
136 bigdata.rtrec.redis IN A 10.67.1.139 135 bigdata.rtrec.redis IN A 10.67.1.139
137 -web.redis IN A 10.66.1.192  
138 push.redis IN A 10.66.5.182 136 push.redis IN A 10.66.5.182
139 redis.crm IN A 10.66.4.143 137 redis.crm IN A 10.66.4.143
140 union.redis IN A 10.66.4.127 138 union.redis IN A 10.66.4.127
141 139
  140 +;web
  141 +redis.web IN A 10.66.105.49
  142 +influxdblog.web IN A 10.66.0.139
  143 +web.zookeeper IN A 10.66.1.192
  144 +
142 145
143 ;hosts 146 ;hosts
144 gateway IN A {{ groups['java-gateway'][0] }} 147 gateway IN A {{ groups['java-gateway'][0] }}
@@ -202,8 +205,6 @@ platform.shareOrder IN A 10.67.90.13 @@ -202,8 +205,6 @@ platform.shareOrder IN A 10.67.90.13
202 photo.search IN A 10.66.0.97 205 photo.search IN A 10.66.0.97
203 search.adaptor IN A 10.66.5.2 206 search.adaptor IN A 10.66.5.2
204 adminstore IN A 10.66.0.133 207 adminstore IN A 10.66.0.133
205 -influxdblog.web IN A 10.66.0.139  
206 -web.zookeeper IN A 10.66.1.192  
207 bigdata.api.crm IN A 10.67.7.2 208 bigdata.api.crm IN A 10.67.7.2
208 bigdata.ftp IN A 10.67.7.2 209 bigdata.ftp IN A 10.67.7.2
209 badjs IN A 10.66.16.6 210 badjs IN A 10.66.16.6