ops / yoho-ansible-roles · Commits

Go to a project

Authored by chunhua.zhang
Commit 31302effb5e1a8f2de09d4c94d042b92d74292db 2 parents b75d581e 11529bee

Merge branch 'txyang' into 'master' 

合并修改

# Changes:
## aws区pfcms灰度域名支持
>> 新增inventory 变量platform_zk_gray、platform_zk_pro、platform_redis、platform_gray替换dns模板的记录

>> 线下、灰度验证通过

## 新增influxdb aws节点
>> 支持通过变量修改influxdb 域名解析

## ufo新增转发规则，删除搜索流量切换旧json模块
>> 线下、灰度验证通过

See merge request !7
Inline Side-by-side
Showing 10 changed files with 35 additions and 68 deletions
... ... @@ -41,6 +41,16 @@ search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn.
# rsyslog server
rsyslog_server: 172.31.9.252
# ops influxdb server
ops_influxdb_server: 10.66.4.25
# platform
platform_zk_gray: 172.31.70.42
platform_zk_pro: 172.31.70.42
platform_redis: 172.31.70.42
platform_gray: 172.31.70.42
#rabbit
rabbit:
common_local: 172.31.9.99
... ...
... ... @@ -40,6 +40,14 @@ search_lb: 10.66.4.112
# rsyslog server
rsyslog_server: 10.66.0.36
# ops influxdb server
ops_influxdb_server: 10.66.4.25
# platform
platform_zk_gray: 10.66.50.107
platform_zk_pro: 10.66.50.140
platform_redis: 10.66.50.132
platform_gray: 10.66.50.107
#rabbit
rabbit:
... ...
... ... @@ -67,6 +67,15 @@ server {
proxy_set_header Host $host;
}
location ^~ /mapp/ {
proxy_redirect off;
proxy_pass http://10.66.16.6/mapp/;
proxy_set_header Host "2.yohobuy.com";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ~* .(txt)$ {
root /Data/local/openresty-1.9.15.1/nginx/html;
... ...
... ... @@ -22,10 +22,10 @@ $TTL 5 ; 5s default TTL
{% set CNAME = 'CNAME' %}
;ops
influxdb IN A 10.66.4.25
influxdb-event IN A 10.66.4.25
influxdb-order IN A 10.66.4.25
monitor.redis IN A 10.66.4.25
influxdb IN A {{ ops_influxdb_server }}
influxdb-event IN A {{ ops_influxdb_server }}
influxdb-order IN A {{ ops_influxdb_server }}
monitor.redis IN A {{ ops_influxdb_server }}
zabbix.master IN A 10.66.0.191
rsyslog IN A {{ rsyslog_server }}
config.server IN A 10.66.80.2
... ... @@ -183,10 +183,10 @@ rabbitmq-erp-gray02 IN A 10.66.50.144
rabbitmq-erp01 IN A 10.66.50.87
rabbitmq-erp02 IN A 10.66.50.100
erp.influxdb IN A 10.66.50.10
zk.pro.platform IN A 10.66.50.140
zk.gray.platform IN A 10.66.50.107
redis.platform IN A 10.66.50.132
apigray.platform IN A 10.66.50.107
zk.pro.platform IN A {{ platform_zk_pro }}
zk.gray.platform IN A {{ platform_zk_gray }}
redis.platform IN A {{ platform_redis }}
apigray.platform IN A {{ platform_gray }}
api.platform IN A 10.66.50.140
serve.erp IN A 10.66.50.7
read.erporders IN A 10.66.50.135
... ...
{
"lb-75axowvj": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az1": 10
}
},
"lb-l9wzc6iv": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az1": 10
}
}
}
{
"lb-75axowvj": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az2": 10
}
},
"lb-l9wzc6iv": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az2": 10
}
}
}
{
"lb-75axowvj": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az1": 10
}
}
}
{
"lb-75axowvj": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az2": 10
}
}
}
{
"lb-l9wzc6iv": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az1": 10
}
}
}
{
"lb-l9wzc6iv": {
"domain":"search.yohoops.org",
"mappings": {
"search-service-az2": 10
}
}
}