Merge pull request #189 from xiao201208/fix/tech_solu_07_zone_id

Fix/tech solu 07 zone
aliyun · Feb 23, 2024 · 4aa988a · 4aa988a
2 parents e042769 + 676463a
commit 4aa988a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml b/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml
@@ -43,15 +43,20 @@ Parameters:
       en: VSwitch Availability Zone1
       zh-cn: 交换机可用区1
     AssociationProperty: 'ALIYUN::ECS::Instance::ZoneId'
+    AssociationPropertyMetadata:
+      AutoSelectFirst: true
+      ExclusiveTo:
+        - Zone2
   Zone2:
     Type: String
     Label:
       en: VSwitch Availability Zone2
       zh-cn: 交换机可用区2
     AssociationProperty: 'ALIYUN::ECS::Instance::ZoneId'
-    Description:
-      en: Please select an availability zone different from Availability Zone1.
-      zh-cn: 请选择与可用区1不同的可用区。
+    AssociationPropertyMetadata:
+      AutoSelectFirst: true
+      ExclusiveTo:
+        - Zone1
   InstancePassword:
     Type: String
     Label:

diff --git a/documents/solution/internet-application-development/video-website-solution.yml b/documents/solution/internet-application-development/video-website-solution.yml
@@ -45,12 +45,20 @@ Parameters:
       en: VSwitch Availability Zone1
       zh-cn: 交换机可用区1
     AssociationProperty: ALIYUN::ECS::Instance::ZoneId
+    AssociationPropertyMetadata:
+      AutoSelectFirst: true
+      ExclusiveTo:
+        - Zone2
   Zone2:
     Type: String
     Label:
       en: VSwitch Availability Zone2
       zh-cn: 交换机可用区2
     AssociationProperty: ALIYUN::ECS::Instance::ZoneId
+    AssociationPropertyMetadata:
+      AutoSelectFirst: true
+      ExclusiveTo:
+        - Zone1
   EcsInstanceType:
     Type: String
     Label:
@@ -326,7 +334,7 @@ Resources:
           cd server
           pip3 install --upgrade pip
           pip3 install -r requirements.txt
-          pip3 install uwsgi
+          pip3 install uwsgi==2.0.22
           sed -i "s/socket=127.0.0.1:5000/http=0.0.0.0:8000/g" uwsgi.ini
           uwsgi uwsgi.ini
   Queue: