Merge branch 'dns_l4' into 'master'

Dns l4



See merge request !39

@@ -37,6 +37,7 @@ java:
 
 # search lb
 search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn.
+uic_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn.
 
 # rsyslog server
 rsyslog_server: 172.31.9.252

 # inventory file for az2
-# auto generated at 2019-01-03 09:19:55
+# auto generated at 2019-01-25 16:19:58
 
 [nameservers]
 172.31.9.217
@@ -13,9 +13,6 @@
 [cobar-server]
 172.31.70.71
 
-[ufo-nginx]
-172.31.70.39
-
 
 [java-activity]
 172.31.70.6

@@ -35,7 +35,8 @@ java:
   single_inner_lb: 10.66.4.112
 
 # search lb
-search_lb: 10.66.4.112
+search_lb: 10.66.70.169
+uic_lb: 10.66.70.16
 
 # rsyslog server
 rsyslog_server: 10.66.0.36

 # inventory file for az1
-# auto generated at 2019-01-25 14:59:21
+# auto generated at 2019-01-25 16:19:58
 
 [nameservers]
 10.66.4.18
@@ -19,11 +19,6 @@
 10.66.4.21
 
 
-[ufo-nginx]
-10.66.70.62
-10.66.70.137
-
-
 [java-activity]
 10.66.70.89
 10.66.70.142

@@ -18,11 +18,6 @@
 10.66.4.21
 
 
-[ufo-nginx]
-10.66.70.62
-10.66.70.137
-
-
 [java-activity]
 10.66.70.89
 10.66.70.142

@@ -422,17 +422,6 @@
   roles:
     - java-rsyslog
 
-- hosts: ufo-nginx
-  vars:
-    rsyslog_module: nginx
-    rsyslog_files:
-      - access_admin.ufo.yohobuy.com
-      - ufo_access
-      - ufo_error
-  remote_user: root
-  roles:
-    - java-rsyslog
-
 - hosts: java-platform-cms
   vars:
     rsyslog_module: pfcms

@@ -36,7 +36,7 @@ influxdb-event                                    IN	A         10.66.251.11
 risk                                              IN	A         10.67.254.22
 write.social                                      IN	A         10.66.251.12
 read.social                                       IN	A         10.66.251.12
-uic                                               IN	A         10.66.4.112
+uic                                               IN	A         10.66.70.16
 rabbitmq-media                                    IN	A         10.66.251.8
 elaticsearch1                                     IN	A         10.66.251.43
 elaticsearch2                                     IN	A         10.66.251.45

@@ -17,7 +17,7 @@
       when: (search_center == 'AWS')
     
     - set_fact:
-        search_lb: 10.66.4.112
+        search_lb: 10.66.70.169
       when: (search_center == 'QCLOUD')
 
   remote_user: root

@@ -46,7 +46,6 @@ git push
 |java-restart-service|重启java服务|
 |ping| ping, 测试用|
 |java-resolv| 修改目标机器的/etc/resolv文件|
-|ufo-nginx| 同步ufo的nginx配置|
 |cobar.reload| 刷新`cobar server`的配置|
 |yoho.dns | 刷新`dns server (bind9)`的配置|
 |yoho.dns.mysql_read_to_master| MySQL数据库读切换到主库。Note: 切换后需要reload cobar|

@@ -113,7 +113,7 @@ sched                                             IN    A         10.66.6.168
 
 
 ;java inner load balancer
-uic                                               IN 	{{ A if ( java.inner_lb  | ipv4) else CNAME }}        {{ java.inner_lb }}
+uic                                               IN 	{{ A if ( uic_lb  | ipv4) else CNAME }}        {{ uic_lb }}
 api.yoho                                          IN	{{ A if ( java.inner_lb  | ipv4) else CNAME }}        {{ java.inner_lb }}
 service.yoho                                      IN	{{ A if ( java.inner_lb  | ipv4) else CNAME }}        {{ java.inner_lb }}
 erp.yoho                                          IN	{{ A if ( java.inner_lb  | ipv4) else CNAME }}         {{ java.inner_lb }}
@@ -232,4 +232,4 @@ now.redis                                         IN	A         10.66.251.11
 
 ;for test
 db.test.fail.write                                 IN	A          {{db_test_write}}
-db.test.fail.read                                  IN	A          {{db_test_read}}
\ No newline at end of file
+db.test.fail.read                                  IN	A          {{db_test_read}}

@@ -13,7 +13,4 @@
 [cobar-server]
 172.31.70.71
 
-[ufo-nginx]
-172.31.70.39
-
 {% extends "java-services.j2" %}

@@ -18,9 +18,4 @@
 10.66.4.20
 10.66.4.21
 
-
-[ufo-nginx]
-10.66.70.62
-10.66.70.137
-
 {% extends "java-services.j2" %}

-# inventory file for az2
-# auto generated at {{time_now}}
-
-[nameservers]
-10.66.105.5
-10.66.105.9
-
-[nameserver-master]
-10.66.105.5
-
-[java-nginx]
-10.66.104.15
-10.66.104.13
-
-
-[cobar-server]
-10.66.105.35
-10.66.105.32
-
-[ufo-nginx]
-10.66.104.18
-
-{% extends "java-services.j2" %}