Merge branch 'tiexin.yang' into 'master'
从gen_inventory.py移除az2 See merge request !8
Showing
2 changed files
with
2 additions
and
4 deletions
1 | # inventory file for az2 | 1 | # inventory file for az2 |
2 | -# auto generated at 2019-01-02 06:39:19 | 2 | +# auto generated at 2019-01-03 09:19:55 |
3 | 3 | ||
4 | [nameservers] | 4 | [nameservers] |
5 | 172.31.9.217 | 5 | 172.31.9.217 |
@@ -52,7 +52,6 @@ | @@ -52,7 +52,6 @@ | ||
52 | [java-order] | 52 | [java-order] |
53 | 172.31.70.116 | 53 | 172.31.70.116 |
54 | 172.31.70.124 | 54 | 172.31.70.124 |
55 | -172.31.70.43 | ||
56 | 55 | ||
57 | 56 | ||
58 | [java-platform-cms] | 57 | [java-platform-cms] |
@@ -67,7 +66,6 @@ | @@ -67,7 +66,6 @@ | ||
67 | [java-promotion] | 66 | [java-promotion] |
68 | 172.31.70.116 | 67 | 172.31.70.116 |
69 | 172.31.70.124 | 68 | 172.31.70.124 |
70 | -172.31.70.43 | ||
71 | 69 | ||
72 | 70 | ||
73 | [java-resources] | 71 | [java-resources] |
@@ -26,7 +26,7 @@ call("git clone --recursive git@git.yoho.cn:yohoops/auto_deploy.git %s" % PATH | @@ -26,7 +26,7 @@ call("git clone --recursive git@git.yoho.cn:yohoops/auto_deploy.git %s" % PATH | ||
26 | 26 | ||
27 | 27 | ||
28 | # get iptables info from git files. | 28 | # get iptables info from git files. |
29 | -azs_mappings = {"qcloud": "az1", "qcloudaz2": "az2", "aws": "aws"} | 29 | +azs_mappings = {"qcloud": "az1", "aws": "aws"} |
30 | host_group = {"yoho_gateway": "java-gateway", | 30 | host_group = {"yoho_gateway": "java-gateway", |
31 | "yoho_users": "java-users", | 31 | "yoho_users": "java-users", |
32 | "yohobuy_resources": "java-resources", | 32 | "yohobuy_resources": "java-resources", |
-
Please register or login to post a comment