Merge pull request #164 from xiao201208/fix/mse_ssd

modify e-commerce and mse template
aliyun · Dec 6, 2023 · e3032f9 · e3032f9
2 parents 47d95ac + cdf0e44
commit e3032f9
Show file tree

Hide file tree

Showing 2 changed files with 386 additions and 129 deletions.
diff --git a/documents/solution/micro/mse-realizes-full-link-grayscale.yml b/documents/solution/micro/mse-realizes-full-link-grayscale.yml
@@ -43,23 +43,13 @@ Parameters:
     AssociationProperty: ALIYUN::ECS::Instance::InstanceType
     AssociationPropertyMetadata:
       ZoneId: ${ZoneId}
+      SystemDiskCategory: cloud_essd
       CreateACKClusterParams:
         NetworkPlugin: terway-eniip
     Description:
       en: It is recommended to use a new generation of ecs instances. If the instance
         specification cannot be selected, please change the availability zone again.
       zh-cn: 建议使用新一代的 ecs 实例，如果选择不到实例规格，请重新更换可用区。
-  WorkerSystemDiskCategory:
-    Type: String
-    Label:
-      en: Worker Node System Disk Category
-      zh-cn: Worker节点系统盘磁盘类型
-    AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory
-    AssociationPropertyMetadata:
-      LocaleKey: DiskCategory
-      ZoneId: ${ZoneId}
-      InstanceType: ${WorkerInstanceType}
-    Default: cloud_essd
   WorkerSystemDiskSize:
     Type: Number
     Label:
@@ -132,6 +122,13 @@ Resources:
       DiskType: alicloud-disk-ssd-multi-zone
       NetType: privatenet
       PubNetworkFlow: 0
+  WaitForAddressReady:
+    Type: ALIYUN::ROS::Sleep
+    DependsOn:
+      - MseGateway
+      - MseMicroRegistryInstance
+    Properties:
+      CreateDuration: 120
   MseServiceSource:
     Type: ALIYUN::MSE::ServiceSource
     Properties:
@@ -188,8 +185,7 @@ Resources:
         ScalingGroup:
           VSwitchIds:
           - Ref: VSwitch
-          SystemDiskCategory:
-            Ref: WorkerSystemDiskCategory
+          SystemDiskCategory: cloud_essd
           SystemDiskPerformanceLevel: PL0
           SystemDiskSize:
             Ref: WorkerSystemDiskSize