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

chunhua.zhang
Commit 5f78404c93ede3e74cb3575d7a9e29c7e727ac7d 2 parents 8cedaf51 ece27aa2
Showing 10 changed files with 154 additions and 13 deletions
scripts/lb_manager/modules/2-1.sh
scripts/lb_manager/modules/all_java_to_az1.json
scripts/lb_manager/modules/all_java_to_az2.json
scripts/lb_manager/modules/az1_java_to_az1.json
scripts/lb_manager/modules/az1_java_to_az2.json
scripts/lb_manager/modules/az2_java_to_az1.json
scripts/lb_manager/modules/az2_java_to_az2.json
scripts/lb_manager/modules/az2_java_to_az2_az3.json
scripts/lb_manager/modules/az3_java_to_az3.json
scripts/lb_manager/modules/search_to_az2.json
--- a/scripts/lb_manager/modules/2-1.sh deleted 100644 → 0
View file @8cedaf5
+++ b/scripts/lb_manager/modules/2-1.sh deleted 100644 → 0
View file @8cedaf5
- sed -i 's/10.66.104.14/10.66.5.4/g' $1
- sed -i 's/10.66.104.4/10.66.5.5/g' $1
- sed -i 's/10.66.104.9/10.66.5.19/g' $1
--- a/scripts/lb_manager/modules/all_java_to_az1.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/all_java_to_az1.json 0 → 100644
View file @5f78404
+ {
+     "lb-09g87u8f": {
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-ivt5h95t": {
+         "domain":"*.yoho.cn",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-990aeqw1": {
+         "domain":"*.yoho.cn",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-75axowvj" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-l9wzc6iv": {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-e9k8lpt1": {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/all_java_to_az2.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/all_java_to_az2.json 0 → 100644
View file @5f78404
+ {
+     "lb-09g87u8f": {
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-ivt5h95t": {
+         "domain":"*.yoho.cn",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-990aeqw1": {
+         "domain":"*.yoho.cn",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-75axowvj" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-l9wzc6iv": {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-e9k8lpt1": {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az1_java_to_az1.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az1_java_to_az1.json 0 → 100644
View file @5f78404
+ {
+     "lb-09g87u8f": {
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-75axowvj" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az1_java_to_az2.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az1_java_to_az2.json 0 → 100644
View file @5f78404
+ {
+     "lb-09g87u8f": {
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-75axowvj" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az2_java_to_az1.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az2_java_to_az1.json 0 → 100644
View file @5f78404
+ {
+     "lb-ivt5h95t": {
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     },
+     "lb-l9wzc6iv" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az1": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az2_java_to_az2.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az2_java_to_az2.json 0 → 100644
View file @5f78404
+ {
+     "lb-ivt5h95t": {
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     },
+     "lb-l9wzc6iv" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az2_java_to_az2_az3.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az2_java_to_az2_az3.json 0 → 100644
View file @5f78404
+ {
+     "lb-ivt5h95t": {
+         "mappings": {
+             "java-nginx-az2": 10,
+             "java-nginx-az3": 10
+         }
+     },
+     "lb-l9wzc6iv" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az2": 10
+             "java-nginx-az3": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/az3_java_to_az3.json 0 → 100644
View file @5f78404
+++ b/scripts/lb_manager/modules/az3_java_to_az3.json 0 → 100644
View file @5f78404
+ {
+     "lb-990aeqw1": {
+         "mappings": {
+             "java-nginx-az3": 10
+         }
+     },
+     "lb-e9k8lpt1" {
+         "domain":"*.yoho.yohoops.org",
+         "mappings": {
+             "java-nginx-az3": 10
+         }
+     }
+ }
--- a/scripts/lb_manager/modules/search_to_az2.json deleted 100644 → 0
View file @8cedaf5
+++ b/scripts/lb_manager/modules/search_to_az2.json deleted 100644 → 0
View file @8cedaf5
- {
-     "lb-8gm6tsyr": {
-         "domain":"search.yohoops.org",
-         "mappings": {
-             "10.66.104.14": 10,
-             "10.66.104.4": 10,
-             "10.66.104.9": 10
-         }
-     }
- }