xuekailun 4 месяцев назад
Родитель
Сommit
0c06e0fa3f

+ 1 - 1
gateway/alb_gateway_scaling_j_count.py

@@ -58,7 +58,7 @@ async def ess_instance(ecs_client, alb_client, ess_count, max_workers, port):
     ess_instance_ids = alb_utils.create_multiple_instances(
         amount=ess_count,
         ecs_client=ecs_client,
-        **gateway_config.instance_config_j,
+        **gateway_config.instance_config_j_alb,
     )
     time.sleep(60)
 

+ 1 - 1
gateway/alb_gateway_unittest.py

@@ -85,7 +85,7 @@ class MyTestCase(unittest.TestCase):
         ess_instance_ids = alb_utils.create_multiple_instances(
             amount=1,
             ecs_client=ecs_client,
-            **gateway_config.instance_config_j,
+            **gateway_config.instance_config_j_alb,
         )
         logging.info(ess_instance_ids)
 

+ 1 - 1
gateway/alb_gateway_update_list.py

@@ -55,7 +55,7 @@ async def ess_instance(ecs_client, alb_client, ess_count, max_workers, version,
     ess_instance_ids = alb_utils.create_multiple_instances(
         amount=ess_count,
         ecs_client=ecs_client,
-        **gateway_config.instance_config_j,
+        **gateway_config.instance_config_j_alb,
     )
     time.sleep(60)
 

+ 1 - 1
gateway/clb_gateway_scaling_j_count.py

@@ -61,7 +61,7 @@ async def ess_instance(ecs_client, clb_client, ess_count, max_workers):
     ess_instance_ids = clb_utils.create_multiple_instances(
         amount=ess_count,
         client=ecs_client,
-        **gateway_config.instance_config_j,
+        **gateway_config.instance_config_j_clb,
     )
     time.sleep(60)
 

+ 1 - 1
gateway/clb_gateway_update_list.py

@@ -55,7 +55,7 @@ async def ess_instance(ecs_client, clb_client, ess_count, max_workers, version):
     ess_instance_ids = clb_utils.create_multiple_instances(
         amount=ess_count,
         client=ecs_client,
-        **gateway_config.instance_config_j,
+        **gateway_config.instance_config_j_clb,
     )
     time.sleep(60)
 

+ 52 - 3
gateway/gateway_config.py

@@ -54,8 +54,34 @@ docker_config = {
 }
 
 
-# 机器配置_hangzhou_j
-instance_config_j = {
+# # 机器配置_hangzhou_j
+# instance_config_j = {
+#     # 使用的镜像信息
+#     'image_id': 'm-bp1e7t7odil9c8kqsm10',
+#     # 设置实例规格
+#     'instance_type': 'ecs.c6.xlarge',
+#     # 选择的交换机
+#     'vswitch_id': 'vsw-bp1ssuwxyrt0p17ceeir0',
+#     # 当前VPC类型的安全组
+#     'security_group_id': 'sg-bp1irhrkr4vfj272hk4y',
+#     # 硬盘的大小,单位:G
+#     'disk_size': '200',
+#     # 服务器命名
+#     'instance_name': 'gateway-alb-[1,2]',
+#     # 服务器所在区域
+#     'zone_id': 'cn-hangzhou-j',
+#     # 磁盘类型:云盘
+#     'disk_category': 'cloud_essd',
+#     # 密钥
+#     'key_pair_name': 'stuuudy',
+#     # tag
+#     'tags': [{"Key": "ecs", "Value": "gateway.prod"}]
+# }
+
+
+
+
+instance_config_j_alb = {
     # 使用的镜像信息
     'image_id': 'm-bp1e7t7odil9c8kqsm10',
     # 设置实例规格
@@ -67,7 +93,7 @@ instance_config_j = {
     # 硬盘的大小,单位:G
     'disk_size': '200',
     # 服务器命名
-    'instance_name': 'ESS-gateway-[1,2]',
+    'instance_name': 'gateway-alb-[1,2]',
     # 服务器所在区域
     'zone_id': 'cn-hangzhou-j',
     # 磁盘类型:云盘
@@ -79,6 +105,29 @@ instance_config_j = {
 }
 
 
+instance_config_j_clb = {
+    # 使用的镜像信息
+    'image_id': 'm-bp1e7t7odil9c8kqsm10',
+    # 设置实例规格
+    'instance_type': 'ecs.c6.xlarge',
+    # 选择的交换机
+    'vswitch_id': 'vsw-bp1ssuwxyrt0p17ceeir0',
+    # 当前VPC类型的安全组
+    'security_group_id': 'sg-bp1irhrkr4vfj272hk4y',
+    # 硬盘的大小,单位:G
+    'disk_size': '200',
+    # 服务器命名
+    'instance_name': 'gateway-prod-[1,2]',
+    # 服务器所在区域
+    'zone_id': 'cn-hangzhou-j',
+    # 磁盘类型:云盘
+    'disk_category': 'cloud_essd',
+    # 密钥
+    'key_pair_name': 'stuuudy',
+    # tag
+    'tags': [{"Key": "ecs", "Value": "gateway.prod"}]
+}
+
 
 
 # 服务启动脚本