diff --git a/examples/elastic/anycasteip-attach-slb-bind-ecs.yml b/examples/elastic/anycasteip-attach-slb-bind-ecs.yml index bd0e9b51..8f7af9f2 100644 --- a/examples/elastic/anycasteip-attach-slb-bind-ecs.yml +++ b/examples/elastic/anycasteip-attach-slb-bind-ecs.yml @@ -117,8 +117,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd ECSInstanceType: Type: String Label: @@ -156,13 +162,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${ECSInstanceType} InstanceChargeType: Type: String Label: @@ -174,6 +177,9 @@ Parameters: monthly subscription.]' zh-cn: '可选值：
[PostPaid: 按量付费。]
[PrePaid: 预付费，包年包月。]' + AssociationProperty: ChargeType + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType Default: PostPaid AllowedValues: - PostPaid @@ -186,7 +192,7 @@ Parameters: Description: en: 'System disk size, range of values: 20-500, units: GB.' zh-cn: 系统盘大小, 取值范围：[20, 500], 单位：GB。 - Default: 20 + Default: 40 MinValue: 20 MaxValue: 500 Count: @@ -233,6 +239,7 @@ Parameters: Login, the key pair name does not need to be filled in zh-cn: 如果是Windows ECS实例，则忽略该参数。默认为空。
如果已填写密钥对名称，实例密码的内容仍会被设置到实例中，但是Linux系统中的密码登录方式会被禁止。
请输入已有密钥对的名称。如使用实例密码登录，密钥对名称不需要填写 + AssociationProperty: ALIYUN::ECS::KeyPair::KeyPairName Default: null Resources: AnycastEip: @@ -445,8 +452,8 @@ Metadata: en: SLB zh-cn: 负载均衡、弹性公网 - Parameters: - - ECSImageId - ECSInstanceType + - ECSImageId - ECSDiskCategory - InstanceChargeType - ECSSysDiskSize diff --git a/examples/elastic/batch-of-ecs-instances.yml b/examples/elastic/batch-of-ecs-instances.yml index 42691c99..66ab817c 100644 --- a/examples/elastic/batch-of-ecs-instances.yml +++ b/examples/elastic/batch-of-ecs-instances.yml @@ -5,36 +5,17 @@ Description: or new VPC, VSW, SG. zh-cn: 此模板支持批量创建按量付费或包年包月的ECS实例，并且支持选择已有VPC，VSW，SG或新建VPC，VSW，SG的场景。 Conditions: - CreatePrepay: + CreateVpcConditions: Fn::Equals: - - null - - Ref: ECSPeriod - CreateSg: - Fn::Not: - Fn::Equals: - - null - - Ref: SecurityGroupName - CreateVpc: - Fn::Not: - Fn::Equals: - - null - - Ref: VpcCidrBlock - CreateVsw: - Fn::Not: - Fn::Equals: - - null - - Ref: VSwitchCidrBlock + - true + - Ref: WhetherCreateVpc Parameters: - VpcId: - Type: String + WhetherCreateVpc: + Type: Boolean Label: - en: Existing VPC ID - zh-cn: 现有VPC的实例ID - Description: - en: Please search the ID starts with (vpc-xxx)from console-Virtual Private Cloud - zh-cn: 控制台-VPC-专有网络下查询 - AssociationProperty: ALIYUN::ECS::VPC::VPCId - Default: null + en: WhetherCreateVpc + zh-cn: 是否新建VPC + Default: false VSwitchZoneId: Type: String Label: @@ -44,20 +25,67 @@ Parameters: en: Availability ID for existing switches zh-cn: 现有交换机的可用区ID AssociationProperty: ALIYUN::ECS::Instance::ZoneId + VpcCidrBlock: + Type: String + Label: + en: VPC CIDR IPv4 Block + zh-cn: 专有网络IPv4网段 + Description: + zh-cn: VPC的IP地址段范围，
您可以使用以下的IP地址段或其子网:
[10.0.0.0/8]
[172.16.0.0/12]
[192.168.0.0/16] + en: 'The IP address range of the VPC in the CidrBlock form;
You can use the following IP address ranges and their subnets:
[10.0.0.0/8]
[172.16.0.0/12]
[192.168.0.0/16]' + AssociationProperty: ALIYUN::VPC::VPC::CidrBlock + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Equals: + - ${WhetherCreateVpc} + - true + Default: 192.168.0.0/16 + VSwitchCidrBlock: + Type: String + Label: + en: ECS VSwitch CIDR Block + zh-cn: ECS交换机子网网段 + Description: + zh-cn: 必须属于VPC的子网段。 + en: Must belong to the subnet segment of VPC. + AssociationProperty: ALIYUN::VPC::VSwitch::CidrBlock + AssociationPropertyMetadata: + VpcCidrBlock: VpcCidrBlock + Visible: + Condition: + Fn::Equals: + - ${WhetherCreateVpc} + - true + Default: 192.168.1.0/24 + VpcId: + Type: String + Label: + en: VPC ID + zh-cn: 专有网络VPC实例ID + AssociationProperty: ALIYUN::ECS::VPC::VPCId + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Equals: + - ${WhetherCreateVpc} + - false + Default: '' VSwitchId: Type: String Label: en: VSwitch ID - zh-cn: 网络交换机ID - Description: - en: Please search the business VSwitch ID starts with(vsw-xxx)from console-Virtual - Private Cloud-VSwitches - zh-cn: 现有业务网络交换机的实例ID,控制台-VPC-专有网络-交换机下查询 + zh-cn: 交换机实例ID AssociationProperty: ALIYUN::ECS::VSwitch::VSwitchId AssociationPropertyMetadata: VpcId: ${VpcId} ZoneId: ${VSwitchZoneId} - Default: null + Visible: + Condition: + Fn::Equals: + - ${WhetherCreateVpc} + - false + Default: '' SecurityGroupId: Type: String Label: @@ -70,39 +98,11 @@ Parameters: AssociationProperty: ALIYUN::ECS::SecurityGroup::SecurityGroupId AssociationPropertyMetadata: VpcId: ${VpcId} - Default: null - VpcCidrBlock: - Type: String - Label: - en: VPC CIDR Block - zh-cn: 专有网络网段 - Description: - en: New proprietary network IP address segment range, recommended use of the - following IP address segments
[10.0.0.0/8]
[172.16.0.0/12]
[192.168.0.0/16] - zh-cn: 新建专有网络IP地址段范围，推荐使用以下的IP地址段
[10.0.0.0/8]
[172.16.0.0/12]
[192.168.0.0/16] - Default: null - VSwitchCidrBlock: - Type: String - Label: - en: VSwitch CIDR Block - zh-cn: 交换机网段 - Description: - en: Must be a sub-network segment of the proprietary network and is not occupied - by other VSwitches. - zh-cn: 必须是所属专有网络的子网段，并且没有被其他交换机占用。 - Default: null - SecurityGroupName: - Type: String - Label: - en: Security Group Name - zh-cn: 安全组名称 - Description: - en: 2 to 128 English or Chinese characters in length.Must start with size letters - or Chinese, not http:// and https://, can contain Numbers, dots (.), underscores - (_) and hyphens (-). - zh-cn: 长度为2~128个英文或中文字符。必须以大小字母或中文开头，不能以http://和https://开头,可包含数字、点（.）、下划线（_）和连字符（-）。 + Visible: + Condition: + Fn::Equals: + - ${WhetherCreateVpc} + - false Default: null Count: Type: Number @@ -113,31 +113,59 @@ Parameters: en: Number of ECS hosts zh-cn: ECS主机数量 Default: 2 - ECSPeriodUnit: + PayType: Type: String Label: - en: ECS Purchase duration of prepaid resources. - zh-cn: 云服务器预付费资源的购买周期 - Description: - en: 'ECS Purchase time and period of prepaid resource, value: [Week, Month].' - zh-cn: 云服务器预付费资源的购买时长周期，取值：[Week（周）, Month（月）] - Default: null + en: ECS Instance Charge Type + zh-cn: ECS付费类型 + AssociationProperty: ChargeType + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType + Default: PostPaid + AllowedValues: + - PostPaid + - PrePaid + PayPeriodUnit: + Type: String + Label: + en: Pay Period Unit + zh-cn: 购买资源时长周期 + AssociationProperty: PayPeriodUnit + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: Month AllowedValues: - - Week - - Month - ECSPeriod: + - Month + - Year + PayPeriod: Type: Number Label: - en: ECS Purchase time of prepaid resources. - zh-cn: 云服务器预付费资源的购买时长 - Description: - en: 'When the purchase cycle of prepaid resource is week, the value range is: - [1,2,3,4]; when the purchase cycle of prepaid resource is month, the value - is: [1,2,3,4,5,6,7,8,9,12,24,36,48,60].' - zh-cn: 云服务器预付费资源的购买时长，当预付费资源的购买周期为Week时，取值范围：[1，2，3，4]; 当预付费资源的购买周期为Month时，取值：[1，2，3，4，5，6，7，8，9，12，24，36，48，60]。 - Default: null - MinValue: 1 - MaxValue: 60 + en: Period + zh-cn: 购买资源时长 + AssociationProperty: PayPeriod + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: 1 + AllowedValues: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 InstanceType: Type: String Label: @@ -162,8 +190,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceName: Type: String Label: @@ -313,17 +347,17 @@ Resources: Properties: VpcId: Fn::If: - - CreateVpc + - CreateVpcConditions - Ref: Vpc - Ref: VpcId VSwitchId: Fn::If: - - CreateVsw + - CreateVpcConditions - Ref: VSwitch - Ref: VSwitchId SecurityGroupId: Fn::If: - - CreateSg + - CreateVpcConditions - Ref: SecurityGroup - Ref: SecurityGroupId ImageId: @@ -337,10 +371,7 @@ Resources: HostName: Ref: HostName InstanceChargeType: - Fn::If: - - CreatePrepay - - PostPaid - - PrePaid + Ref: PayType InstanceName: Ref: InstanceName InstanceType: @@ -350,9 +381,9 @@ Resources: Password: Ref: Password Period: - Ref: ECSPeriod + Ref: PayPeriod PeriodUnit: - Ref: ECSPeriodUnit + Ref: PayPeriodUnit SystemDiskAutoSnapshotPolicyId: Ref: AutoSnapshotPolicy SystemDiskCategory: @@ -364,11 +395,11 @@ Resources: id: 3d97f557-f6c2-475f-bdca-942c45e583b5 SecurityGroup: Type: ALIYUN::ECS::SecurityGroup - Condition: CreateSg + Condition: CreateVpcConditions Properties: VpcId: Fn::If: - - CreateVpc + - CreateVpcConditions - Ref: Vpc - Ref: VpcId SecurityGroupEgress: @@ -393,20 +424,18 @@ Resources: PortRange: -1/-1 Priority: 1 SourceCidrIp: 0.0.0.0/0 - SecurityGroupName: - Ref: SecurityGroupName Metadata: ALIYUN::ROS::Designer: id: de0e55c1-4cf9-4647-bbdd-6e1c8deba4cd VSwitch: Type: ALIYUN::ECS::VSwitch - Condition: CreateVsw + Condition: CreateVpcConditions Properties: ZoneId: Ref: VSwitchZoneId VpcId: Fn::If: - - CreateVpc + - CreateVpcConditions - Ref: Vpc - Ref: VpcId CidrBlock: @@ -416,7 +445,7 @@ Resources: id: cc854ba9-a556-4503-8c21-e52165d2ecde Vpc: Type: ALIYUN::ECS::VPC - Condition: CreateVpc + Condition: CreateVpcConditions Properties: CidrBlock: Ref: VpcCidrBlock @@ -433,21 +462,22 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: + - WhetherCreateVpc - VpcId - VSwitchZoneId - VSwitchId - SecurityGroupId - VpcCidrBlock - VSwitchCidrBlock - - SecurityGroupName Label: default: en: Infrastructure Configuration zh-cn: 基础资源配置（必填） - Parameters: - Count - - ECSPeriodUnit - - ECSPeriod + - PayType + - PayPeriodUnit + - PayPeriod - InstanceType - EcsImageId - InstanceName diff --git a/examples/elastic/data-disk-snapshot.yml b/examples/elastic/data-disk-snapshot.yml index b0d40982..a57f4faf 100644 --- a/examples/elastic/data-disk-snapshot.yml +++ b/examples/elastic/data-disk-snapshot.yml @@ -51,7 +51,15 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_6 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + RegionId: ${RegionId} + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -83,6 +91,7 @@ Parameters: Description: en: The snapshot ID of the first data disk. zh-cn: 第一个数据磁盘的快照ID。 + AssociationProperty: ALIYUN::ECS::Snapshot::SnapshotId FirstDataDiskName: Type: String Label: @@ -113,10 +122,10 @@ Parameters: en: 'First data disk category: efficient cloud disk(cloud_efficiency) or SSD cloud disk(cloud_ssd)' zh-cn: 第一块数据盘类别：高效云盘（cloud_efficiency）或固态云盘（cloud_ssd） - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} SecondDataDiskSourceSnapshotId: Type: String Label: @@ -125,6 +134,7 @@ Parameters: Description: en: The snapshot ID of the second data disk. zh-cn: 第二个数据磁盘的快照ID。 + AssociationProperty: ALIYUN::ECS::Snapshot::SnapshotId SecondDataDiskName: Type: String Label: @@ -144,11 +154,10 @@ Parameters: en: 'Second data disk category: average cloud disk(cloud), efficient cloud disk(cloud_efficiency) or SSD cloud disk(cloud_ssd)' zh-cn: 第二块数据盘盘类别：普通云盘（cloud）、高效云盘（cloud_efficiency）或固态云盘（cloud_ssd） - Default: cloud_ssd - AllowedValues: - - cloud - - cloud_efficiency - - cloud_ssd + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} SecondDataDiskSize: Type: Number Label: @@ -196,13 +205,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} TotalDataDisk: Type: String Label: @@ -394,13 +400,13 @@ Metadata: Label: default: VPC - Parameters: - - ImageId - InstanceType + - ImageId - MountPoint - FirstDataDiskSourceSnapshotId - FirstDataDiskName - - FirstDataDiskSize - FirstDataDiskCategory + - FirstDataDiskSize - SecondDataDiskSourceSnapshotId - SecondDataDiskName - SecondDataDiskCategory diff --git a/examples/elastic/ecs-a-record.yml b/examples/elastic/ecs-a-record.yml index a046fd7f..22916bf1 100644 --- a/examples/elastic/ecs-a-record.yml +++ b/examples/elastic/ecs-a-record.yml @@ -48,7 +48,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${EcsInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd EcsInstanceType: Type: String Label: @@ -70,23 +77,10 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: ${EcsInstanceType} + ZoneId: ${VSwitchZoneId} EcsSystemDiskSize: Type: Number Label: @@ -268,8 +262,8 @@ Metadata: default: DNS - Parameters: - VSwitchZoneId - - EcsImageId - EcsInstanceType + - EcsImageId - EcsSystemDiskCategory - EcsSystemDiskSize - EcsPassword diff --git a/examples/elastic/ecs-instance-group-clone.yml b/examples/elastic/ecs-instance-group-clone.yml index 83f76372..52940639 100644 --- a/examples/elastic/ecs-instance-group-clone.yml +++ b/examples/elastic/ecs-instance-group-clone.yml @@ -30,6 +30,7 @@ Parameters: Description: en: The source ECS instance ID to be cloned zh-cn: 需要克隆的ECS实例ID + AssociationProperty: ALIYUN::ECS::Instance::InstanceId MaxAmount: Type: Number Label: diff --git a/examples/elastic/ecs-instance-group-vpc-bind-eip-by-count.yml b/examples/elastic/ecs-instance-group-vpc-bind-eip-by-count.yml index a18ac468..f2549639 100644 --- a/examples/elastic/ecs-instance-group-vpc-bind-eip-by-count.yml +++ b/examples/elastic/ecs-instance-group-vpc-bind-eip-by-count.yml @@ -40,9 +40,8 @@ Parameters: Label: en: EIP Charge Type zh-cn: 弹性公网地址的收费类型 - Description: - en: The charge type of EIP, PayByBandwidth；PayByTraffic. - zh-cn: 弹性公网地址的收费类型，PayByBandwidth：按带宽付费，PayByTraffic：按流量付费 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -80,8 +79,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd ECSInstanceType: Type: String Label: @@ -119,13 +124,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + ZoneId: ${ECSZoneId} ECSSysDiskSize: Type: Number Label: @@ -148,6 +150,8 @@ Parameters: monthly subscription.]' zh-cn: '可选值：
[PostPaid: 按量付费。]
[PrePaid: 预付费，包年包月。]' + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType Default: PostPaid AllowedValues: - PostPaid @@ -195,6 +199,7 @@ Parameters: Login, the key pair name does not need to be filled in zh-cn: 如果是Windows ECS实例，则忽略该参数。默认为空。
如果已填写密钥对名称，实例密码的内容仍会被设置到实例中，但是Linux系统中的密码登录方式会被禁止。
请输入已有密钥对的名称。如使用实例密码登录，密钥对名称不需要填写 + AssociationProperty: ALIYUN::ECS::KeyPair::KeyPairName Default: null Resources: EcsVpc: @@ -337,8 +342,8 @@ Metadata: - Parameters: - Count - ECSZoneId - - ECSImageId - ECSInstanceType + - ECSImageId - ECSDiskCategory - ECSSysDiskSize - InstanceChargeType diff --git a/examples/elastic/ecs-instance-group-vpc.yml b/examples/elastic/ecs-instance-group-vpc.yml index d37ef693..134de1a2 100644 --- a/examples/elastic/ecs-instance-group-vpc.yml +++ b/examples/elastic/ecs-instance-group-vpc.yml @@ -89,16 +89,21 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InternetChargeType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InternetChargeType: Type: String Label: en: Internet Charge Type zh-cn: 公网计费方式 - Description: - en: Instance internet access charge type.Support 'PayByBandwidth' and 'PayByTraffic' - only. - zh-cn: 访问公网计费方式，可用值：PayByBandwidth（按固定带宽计费）、PayByTraffic（按流量计费）。 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -139,24 +144,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统磁盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} VSwitchCidrBlock: Type: String Label: @@ -289,9 +280,9 @@ Metadata: - InstanceType - ImageId - InternetChargeType - - Password - MaxAmount - SystemDiskCategory + - Password Label: default: ECS TemplateTags: diff --git a/examples/elastic/ecs-ipv6-instance.yml b/examples/elastic/ecs-ipv6-instance.yml index 5650450f..5c8dcc01 100644 --- a/examples/elastic/ecs-ipv6-instance.yml +++ b/examples/elastic/ecs-ipv6-instance.yml @@ -60,7 +60,14 @@ Parameters:
Windows System Select：win2008r2；win2012r2；win2016 zh-cn: 镜像ID,
Linux系统请选择：centos_7
Windows系统请选择：win2008r2；win2012r2；win2016 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -85,7 +92,7 @@ Parameters: Description: en: 'System disk size, range of values: 20-500, units: GB.' zh-cn: 系统盘大小, 取值范围：[20, 500], 单位：GB。 - Default: 20 + Default: 40 InstancePublicIP: Type: Boolean Label: @@ -100,12 +107,8 @@ Parameters: Label: en: IPv6 Metric Bandwidth is Billed. zh-cn: IPv6公网带宽的计费方式 - Description: - en: 'Optional values:
[PayByTraffic: Billing by Usage]
[PayByBandwidth: Billing - by Bandwidth]' - zh-cn: '可选值：
[PayByTraffic: 按流量计费]
[PayByBandwidth: - 按带宽计费]' + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByBandwidth AllowedValues: - PayByTraffic @@ -131,6 +134,8 @@ Parameters: en: 'IPv6 gateway specifications, optional values: Small (free version), Medium (enterprise version), Large (enterprise enhancement version)' zh-cn: IPv6网关的规格,可选值：Small（免费版），Medium（企业版），Large（企业增强版） + AssociationPropertyMetadata: + LocaleKey: NatGatewaySpec Default: Small AllowedValues: - Small @@ -151,14 +156,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${InstanceType} InstancePassword: Type: String Label: @@ -401,8 +402,8 @@ Metadata: - VpcCidrBlock - VSwitchCidrBlock - VSwitchZoneId - - InstanceImageId - InstanceType + - InstanceImageId - SystemDiskSize - InstancePublicIP - InternetChargeType diff --git a/examples/elastic/ecs-json-data-transmission.yml b/examples/elastic/ecs-json-data-transmission.yml index ac3fb2e6..7a9681f1 100644 --- a/examples/elastic/ecs-json-data-transmission.yml +++ b/examples/elastic/ecs-json-data-transmission.yml @@ -44,30 +44,23 @@ Parameters: image resources. zh-cn: 镜像ID，详情请参考公共镜像。 - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd SystemDiskCategory: Type: String Label: en: ECS System Disk Category zh-cn: ECS系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${InstanceType} InternetChargeType: Type: String Label: @@ -77,6 +70,8 @@ Parameters: en: The charge type of public internet.Support 'PayByBandwidth' and 'PayByTraffic' only. zh-cn: 访问公网计费方式，可用值：PayByBandwidth（按固定带宽计费）、PayByTraffic（按流量计费）。 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth diff --git a/examples/elastic/ecs-kubernetes-cluster.yml b/examples/elastic/ecs-kubernetes-cluster.yml index e354e6d5..ae8ab58f 100644 --- a/examples/elastic/ecs-kubernetes-cluster.yml +++ b/examples/elastic/ecs-kubernetes-cluster.yml @@ -55,17 +55,10 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'System disk type, you must select the type of disk that the instance supports.
Optional values:
[cloud_efficiency: Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]' - zh-cn: '系统盘类型，须选择实例支持的磁盘类型。
可选值：
[cloud_efficiency: - 高效云盘]
[cloud_ssd: SSD云盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${MasterInstanceType} MasterSystemDiskSize: Type: Number Label: @@ -116,10 +109,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${WorkerInstanceType} WorkerSystemDiskSize: Type: Number Label: diff --git a/examples/elastic/ecs-multi-dynamic-ip.yml b/examples/elastic/ecs-multi-dynamic-ip.yml index 30d27fc9..9628ef88 100644 --- a/examples/elastic/ecs-multi-dynamic-ip.yml +++ b/examples/elastic/ecs-multi-dynamic-ip.yml @@ -36,7 +36,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${EcsInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd EcsInstanceType: Type: String Label: @@ -74,13 +81,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${EcsInstanceType} EcsSystemDiskSize: Type: Number Label: @@ -279,8 +283,8 @@ Metadata: en: VPC zh-cn: 专有网络 - Parameters: - - EcsImageId - EcsInstanceType + - EcsImageId - EcsSystemDiskCategory - EcsSystemDiskSize - EcsPassword diff --git a/examples/elastic/ecs-vpc-instance.yml b/examples/elastic/ecs-vpc-instance.yml index 2b93a788..496b2d45 100644 --- a/examples/elastic/ecs-vpc-instance.yml +++ b/examples/elastic/ecs-vpc-instance.yml @@ -15,17 +15,6 @@ Parameters: Zone zh-cn: 可用区ID。
注： 选择前请确认该可用区是否支持创建ECS资源的规格，建议与其他交换机可用区不同 AssociationProperty: ALIYUN::ECS::Instance:ZoneId - InstanceImageId: - Type: String - Label: - en: Image - zh-cn: 镜像 - Description: - en: Image ID，see detail：Find the mirror - zh-cn: 镜像ID,详见：查找镜像 - Default: centos_7 InstanceType: Type: String Label: @@ -42,6 +31,24 @@ Parameters: AssociationProperty: ALIYUN::ECS::Instance::InstanceType AssociationPropertyMetadata: ZoneId: VSwitchZoneId + InstanceImageId: + Type: String + Label: + en: Image + zh-cn: 镜像 + Description: + en: Image ID，see detail：Find the mirror + zh-cn: 镜像ID,详见：查找镜像 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd SystemDiskSize: Type: Number Label: @@ -50,7 +57,7 @@ Parameters: Description: en: 'System disk size, range of values: 20-500, units: GB.' zh-cn: 系统盘大小, 取值范围：[20, 500], 单位：GB。 - Default: 20 + Default: 40 InstancePublicIP: Type: Boolean Label: @@ -83,24 +90,10 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${InstanceType} Resources: EcsVpc: Type: ALIYUN::ECS::VPC @@ -170,12 +163,12 @@ Metadata: ParameterGroups: - Parameters: - VSwitchZoneId - - InstanceImageId - InstanceType + - InstanceImageId - SystemDiskSize - InstancePublicIP - - InstancePassword - SystemDiskCategory + - InstancePassword Label: default: ECS TemplateTags: diff --git a/examples/elastic/entire-ecs-clone.yml b/examples/elastic/entire-ecs-clone.yml index a304b64a..ae6cc9c1 100644 --- a/examples/elastic/entire-ecs-clone.yml +++ b/examples/elastic/entire-ecs-clone.yml @@ -70,29 +70,15 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory AssociationPropertyMetadata: + ZoneId: ${ZoneId} Visible: Condition: Fn::Equals: - ${CloneMode} - CloneEcsDisk Default: null - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd NumberOfClonedEcs: Type: Number Label: diff --git a/examples/elastic/ess-1-slb-2-rds-2-ecs.yml b/examples/elastic/ess-1-slb-2-rds-2-ecs.yml index 5b688992..fad2ea57 100644 --- a/examples/elastic/ess-1-slb-2-rds-2-ecs.yml +++ b/examples/elastic/ess-1-slb-2-rds-2-ecs.yml @@ -4,6 +4,18 @@ Description: and ESS to the SLB. zh-cn: 创建1个SLB、1个ESS和1个RDS，通过ESS创建2个ECS实例。将ECS实例和ESS绑定到SLB上。 Parameters: + VSwitchZoneId: + Type: String + Label: + en: VSwitch Availability Zone + zh-cn: 交换机可用区 + Description: + en: Availability Zone ID.
note：before selecting, please + confirm that the Availability Zone supports the specification of creating + ECS resources,which is recommended to be different from other VSwitch Availability + Zone + zh-cn: 可用区ID。
注： 选择前请确认该可用区是否支持创建ECS资源的规格，建议与其他交换机可用区不同 + AssociationProperty: ALIYUN::ECS::Instance:ZoneId EcsImageId: Type: String Label: @@ -15,7 +27,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源，详见：查看镜像资源 - AssociationProperty: ALIYUN::ECS::Instance:ImageId + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${EcsInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd EcsInstanceType: Type: String Label: @@ -28,6 +47,8 @@ Parameters: zh-cn: ECS实例类型，进入产品控制台确保当前实例可用, 详见：查看实例类型 AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: VSwitchZoneId EcsInternetChargeType: Type: String Label: @@ -36,6 +57,8 @@ Parameters: Description: en: The charge type of public internet instance zh-cn: 实例的收费类型，paybytraffic：按流量付费，paybybandwidth：按带宽付费 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: paybytraffic AllowedValues: - paybytraffic @@ -55,13 +78,33 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${EcsInstanceType} + Category: + AssociationPropertyMetadata: + LocaleKey: RDSCategory + Default: Null + Required: false AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + - Basic + - HighAvailability + - cluster + Label: + zh-cn: 实例系列 + en: Category + Type: String + EngineVersion: + AssociationPropertyMetadata: + Engine: MySQL + Default: '8.0' + Required: true + Label: + zh-cn: 数据库版本号 + en: EngineVersion + AssociationProperty: ALIYUN::RDS::Engine::EngineVersion + Type: String RdsDBInstanceClass: Type: String Label: @@ -73,6 +116,12 @@ Parameters: target='_blank'>Instance specification sheet zh-cn: 根据数据库引擎的类型和可用的区域支持选择实例规格；
详见：实例规格表 + AssociationProperty: ALIYUN::RDS::Instance::InstanceType + AssociationPropertyMetadata: + Engine: MySQL + Category: ${Category} + EngineVersion: ${EngineVersion} + ZoneId: ${VSwitchZoneId} Default: rds.mysql.s1.small RdsDBInstanceNetType: Type: String @@ -83,6 +132,8 @@ Parameters: en: Database instance net type, Internet for public access, Intranet for private access. zh-cn: 数据库实例网络类型，Internet用于公共访问，Intranet用于私网访问。 + AssociationPropertyMetadata: + LocaleKey: NetType AllowedValues: - Internet - Intranet @@ -97,24 +148,9 @@ Parameters: ConstraintDescription: en: 'Incrementing in every 5G, unit: GB' zh-cn: 每5G递增，单位：GB。 - Default: 5 + Default: 500 MinValue: 5 MaxValue: 2000 - DBInstanceEngineAndVersion: - Type: String - Label: - en: Engine And Version - zh-cn: 引擎类型及版本 - Description: - en: Database instance engine type, default is 'Mysql'.Support MySQL/SQLServer/PostgreSQL/PPAS/MariaDB - now. - zh-cn: 数据库实例引擎类型，默认为Mysql，现在支持Mysql/SQLServer/PostgreSQL/PPAS/MariaDB。 - Default: MySQL-5.6 - AllowedValues: - - MySQL-5.6 - - SQLServer-2008r2 - - PostgreSQL-9.4 - - PPAS-9.3 RdsSecurityIPList: Type: String Label: @@ -199,16 +235,15 @@ Resources: Type: ALIYUN::ECS::VSwitch Properties: ZoneId: - Fn::Select: - - '0' - - Fn::GetAZs: - Ref: ALIYUN::Region + Ref: VSwitchZoneId VpcId: Ref: Vpc CidrBlock: 192.168.0.0/16 Database: Type: ALIYUN::RDS::DBInstance Properties: + ZoneId: + Ref: VSwitchZoneId VpcId: Ref: Vpc VSwitchId: @@ -219,18 +254,9 @@ Resources: Ref: RdsDBInstanceNetType DBInstanceStorage: Ref: RdsDBInstanceStorage - Engine: - Fn::Select: - - '0' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Engine: MySQL EngineVersion: - Fn::Select: - - '1' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Ref: EngineVersion SecurityIPList: Ref: RdsSecurityIPList SG: @@ -323,6 +349,7 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: + - VSwitchZoneId - EcsImageId - EcsInstanceType - EcsInternetChargeType @@ -330,10 +357,11 @@ Metadata: Label: default: ECS - Parameters: + - Category + - EngineVersion - RdsDBInstanceClass - RdsDBInstanceNetType - RdsDBInstanceStorage - - DBInstanceEngineAndVersion - RdsSecurityIPList Label: default: RDS diff --git a/examples/elastic/existing-vpc-anycasteip-attach-slb-bind-ecs.yml b/examples/elastic/existing-vpc-anycasteip-attach-slb-bind-ecs.yml index 9814c88a..02a666db 100644 --- a/examples/elastic/existing-vpc-anycasteip-attach-slb-bind-ecs.yml +++ b/examples/elastic/existing-vpc-anycasteip-attach-slb-bind-ecs.yml @@ -24,6 +24,9 @@ Parameters: must be under VPC. ECS will be created under this VSwitch zh-cn: 现有交换机ID,控制台-VPC-交换机下查询，交换机必须在VPC下。ECS将创建在此交换机下 AssociationProperty: ALIYUN::ECS::VSwitch::VSwitchId + AssociationPropertyMetadata: + VpcId: ${VPC} + ZoneId: ${VSwitchZoneId} SecurityGroup: Type: String Label: @@ -34,6 +37,8 @@ Parameters: & Security zh-cn: 现有业务安全组的实例ID,控制台-ECS-网络与安全-安全组下查询。
安全组必须归属在VPC下。 AssociationProperty: ALIYUN::ECS::SecurityGroup::SecurityGroupId + AssociationPropertyMetadata: + VpcId: ${VPC} VSwitchZoneId: Type: String Label: @@ -55,8 +60,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd ECSInstanceType: Type: String Label: @@ -84,34 +95,17 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${ECSInstanceType} InstanceChargeType: Type: String Label: en: Instance Charge Type zh-cn: 实例的付费方式 - Description: - en: 'Optional values:
[PostPaid: Pay as you go.]
[PrePaid: Prepaid, - monthly subscription.]' - zh-cn: '可选值：
[PostPaid: 按量付费。]
[PrePaid: - 预付费，包年包月。]' + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType Default: PostPaid AllowedValues: - PostPaid @@ -171,6 +165,7 @@ Parameters: the key pair name does not need to be filled in zh-cn: 如果是Windows ECS实例，则忽略该参数。默认为空。
如果已填写密钥对名称，实例密码的内容仍会被设置到实例中，但是Linux系统中的密码登录方式会被禁止。
请输入已有密钥对的名称。如使用实例密码登录，密钥对名称不需要填写 + AssociationProperty: ALIYUN::ECS::KeyPair::KeyPairName Default: null LoadBalancerAddressType: Type: String @@ -233,16 +228,6 @@ Parameters: zh-cn: 任播弹性公网名称,以大小字母或中文开头，可包含数字，下划线（_）或短划线（-） Default: auto_name AllowedPattern: '[0-9A-Za-z\_\-]+$' - SecurityGroupName: - Type: String - Label: - en: Security Group Name - zh-cn: 安全组名称 - Description: - en: The security group name, consists of 2~128 letters, Chinese characters, - Numbers, dots (.), underscores (_) and hyphens (-). - zh-cn: 安全组名称，由2~128个字母、汉字、数字、点（.）、下划线（_）和连字符（-）组成。 - Default: ROS_SG Resources: AnycastEip: Type: ALIYUN::VPC::AnycastEIP @@ -374,16 +359,16 @@ Metadata: ParameterGroups: - Parameters: - VPC + - VSwitchZoneId - VSwitch - SecurityGroup - - VSwitchZoneId Label: default: en: SecurityGroup zh-cn: 网络 - Parameters: - - ECSImageId - ECSInstanceType + - ECSImageId - ECSDiskCategory - InstanceChargeType - ECSSysDiskSize diff --git a/examples/elastic/existing-vpc-ecs-bind-eip-by-count.yml b/examples/elastic/existing-vpc-ecs-bind-eip-by-count.yml index 77cdbd39..4c504921 100644 --- a/examples/elastic/existing-vpc-ecs-bind-eip-by-count.yml +++ b/examples/elastic/existing-vpc-ecs-bind-eip-by-count.yml @@ -23,6 +23,9 @@ Parameters: must be under VPC. ECS will be created under this VSwitch zh-cn: 现有交换机ID,控制台-VPC-交换机下查询，交换机必须在VPC下。ECS将创建在此交换机下 AssociationProperty: ALIYUN::ECS::VSwitch::VSwitchId + AssociationPropertyMetadata: + VpcId: ${VPC} + ZoneId: ${ECSZoneId} SecurityGroup: Type: String Label: @@ -33,6 +36,8 @@ Parameters: & Security zh-cn: 现有业务安全组的实例ID,控制台-ECS-网络与安全-安全组下查询。
安全组必须归属在VPC下。 AssociationProperty: ALIYUN::ECS::SecurityGroup::SecurityGroupId + AssociationPropertyMetadata: + VpcId: ${VPC} EIPBandwidth: Type: Number Label: @@ -49,9 +54,8 @@ Parameters: Label: en: EIP Charge Type zh-cn: 弹性公网地址的收费类型 - Description: - en: The charge type of EIP, PayByBandwidth；PayByTraffic. - zh-cn: 弹性公网地址的收费类型，PayByBandwidth：按带宽付费，PayByTraffic：按流量付费 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -92,8 +96,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd ECSInstanceType: Type: String Label: @@ -131,13 +141,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${ECSInstanceType} ECSSysDiskSize: Type: Number Label: @@ -149,21 +156,6 @@ Parameters: Default: 40 MinValue: 40 MaxValue: 500 - InstanceChargeType: - Type: String - Label: - en: Instance Charge Type - zh-cn: 实例的付费方式 - Description: - en: 'Optional values:
[PostPaid: Pay as you go.]
[PrePaid: Prepaid, - monthly subscription.]' - zh-cn: '可选值：
[PostPaid: 按量付费。]
[PrePaid: - 预付费，包年包月。]' - Default: PostPaid - AllowedValues: - - PostPaid - - PrePaid ECSPassword: Type: String Label: @@ -197,7 +189,61 @@ Parameters: Login, the key pair name does not need to be filled in zh-cn: 如果是Windows ECS实例，则忽略该参数。默认为空。
如果已填写密钥对名称，实例密码的内容仍会被设置到实例中，但是Linux系统中的密码登录方式会被禁止。
请输入已有密钥对的名称。如使用实例密码登录，密钥对名称不需要填写 + AssociationProperty: ALIYUN::ECS::KeyPair::KeyPairName Default: null + PayType: + Type: String + Label: + en: ECS Instance Charge Type + zh-cn: ECS付费类型 + AssociationProperty: ChargeType + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType + Default: PostPaid + AllowedValues: + - PostPaid + - PrePaid + PayPeriodUnit: + Type: String + Label: + en: Pay Period Unit + zh-cn: 购买资源时长周期 + AssociationProperty: PayPeriodUnit + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: Month + AllowedValues: + - Month + - Year + PayPeriod: + Type: Number + Label: + en: Period + zh-cn: 购买资源时长 + AssociationProperty: PayPeriod + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: 1 + AllowedValues: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 Resources: ECSInstanceGroup: Type: ALIYUN::ECS::InstanceGroup @@ -214,7 +260,11 @@ Resources: Ref: ECSImageId AllocatePublicIP: 'false' InstanceChargeType: - Ref: InstanceChargeType + Ref: PayType + Period: + Ref: PayPeriod + PeriodUnit: + Ref: PayPeriodUnit InstanceType: Ref: ECSInstanceType IoOptimized: optimized @@ -276,6 +326,7 @@ Metadata: ParameterGroups: - Parameters: - VPC + - ECSZoneId - VSwitch - SecurityGroup Label: @@ -286,13 +337,19 @@ Metadata: Label: default: EIP - Parameters: - - Count - - ECSZoneId - - ECSImageId + - PayType + - PayPeriodUnit + - PayPeriod + Label: + default: + en: ECS PayType Configuration + zh-cn: ECS付费类型配置 + - Parameters: - ECSInstanceType + - ECSImageId - ECSDiskCategory - ECSSysDiskSize - - InstanceChargeType + - Count - ECSPassword - KeyPairName Label: diff --git a/examples/elastic/existing-vpc-one-ecs-bind-eip.yml b/examples/elastic/existing-vpc-one-ecs-bind-eip.yml index a93f6502..3ea4e180 100644 --- a/examples/elastic/existing-vpc-one-ecs-bind-eip.yml +++ b/examples/elastic/existing-vpc-one-ecs-bind-eip.yml @@ -25,6 +25,7 @@ Parameters: AssociationProperty: ALIYUN::ECS::VSwitch::VSwitchId AssociationPropertyMetadata: VpcId: VPC + ZoneId: ${ECSZoneId} SecurityGroup: Type: String Label: @@ -56,6 +57,8 @@ Parameters: Description: en: The charge type of EIP, PayByBandwidth；PayByTraffic. zh-cn: 弹性公网地址的收费类型，PayByBandwidth：按带宽付费，PayByTraffic：按流量付费 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -85,8 +88,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - AssociationProperty: ALIYUN::ECS::Instance::ImageId - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${ECSInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd ECSInstanceType: Type: String Label: @@ -108,7 +117,7 @@ Parameters: 16GiB 内网带宽2.5Gbps 内网收发包80万PPS] AssociationProperty: ALIYUN::ECS::Instance::InstanceType AssociationPropertyMetadata: - InstanceChargeType: InstanceChargeType + InstanceChargeType: PayType ZoneId: ECSZoneId ECSDiskCategory: Type: String @@ -140,21 +149,59 @@ Parameters: Default: 20 MinValue: 20 MaxValue: 500 - InstanceChargeType: + PayType: Type: String Label: - en: Instance Charge Type - zh-cn: 实例的付费方式 - Description: - en: 'Optional values:
[PostPaid: Pay as you go.]
[PrePaid: Prepaid, - monthly subscription.]' - zh-cn: '可选值：
[PostPaid: 按量付费。]
[PrePaid: - 预付费，包年包月。]' + en: ECS Instance Charge Type + zh-cn: ECS付费类型 + AssociationProperty: ChargeType + AssociationPropertyMetadata: + LocaleKey: InstanceChargeType Default: PostPaid AllowedValues: - - PostPaid - - PrePaid + - PostPaid + - PrePaid + PayPeriodUnit: + Type: String + Label: + en: Pay Period Unit + zh-cn: 购买资源时长周期 + AssociationProperty: PayPeriodUnit + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: Month + AllowedValues: + - Month + - Year + PayPeriod: + Type: Number + Label: + en: Period + zh-cn: 购买资源时长 + AssociationProperty: PayPeriod + AssociationPropertyMetadata: + Visible: + Condition: + Fn::Not: + Fn::Equals: + - ${PayType} + - PostPaid + Default: 1 + AllowedValues: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 ECSPassword: Type: String Label: @@ -205,10 +252,14 @@ Resources: ImageId: Ref: ECSImageId AllocatePublicIP: 'false' - InstanceChargeType: - Ref: InstanceChargeType InstanceType: Ref: ECSInstanceType + InstanceChargeType: + Ref: PayType + Period: + Ref: PayPeriod + PeriodUnit: + Ref: PayPeriodUnit IoOptimized: optimized KeyPairName: Ref: KeyPairName @@ -261,6 +312,7 @@ Metadata: ParameterGroups: - Parameters: - VPC + - ECSZoneId - VSwitch - SecurityGroup Label: @@ -271,12 +323,18 @@ Metadata: Label: default: EIP - Parameters: - - ECSZoneId - - ECSImageId + - PayType + - PayPeriodUnit + - PayPeriod + Label: + default: + en: ECS PayType Configuration + zh-cn: ECS付费类型配置 + - Parameters: - ECSInstanceType + - ECSImageId - ECSDiskCategory - ECSSysDiskSize - - InstanceChargeType - ECSPassword - KeyPairName Label: diff --git a/examples/elastic/existing-vpc-single-flink.yml b/examples/elastic/existing-vpc-single-flink.yml index 6a42ff9a..9ef1eea3 100644 --- a/examples/elastic/existing-vpc-single-flink.yml +++ b/examples/elastic/existing-vpc-single-flink.yml @@ -81,7 +81,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -116,23 +123,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -334,10 +328,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: Flink Configuration diff --git a/examples/elastic/existing-vpc-single-hdfs.yml b/examples/elastic/existing-vpc-single-hdfs.yml index 39976726..9b920c93 100644 --- a/examples/elastic/existing-vpc-single-hdfs.yml +++ b/examples/elastic/existing-vpc-single-hdfs.yml @@ -82,7 +82,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -117,23 +124,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -384,10 +378,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: HDFS Configuration diff --git a/examples/elastic/existing-vpc-single-hive.yml b/examples/elastic/existing-vpc-single-hive.yml index f9011ae0..8ad767ca 100644 --- a/examples/elastic/existing-vpc-single-hive.yml +++ b/examples/elastic/existing-vpc-single-hive.yml @@ -81,7 +81,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -116,23 +123,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -592,11 +586,11 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize - MysqlPassword + - InstancePassword Label: default: en: Hive Configuration diff --git a/examples/elastic/existing-vpc-single-jenkins.yml b/examples/elastic/existing-vpc-single-jenkins.yml index 1bf73ef6..900949f1 100644 --- a/examples/elastic/existing-vpc-single-jenkins.yml +++ b/examples/elastic/existing-vpc-single-jenkins.yml @@ -84,7 +84,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -119,23 +126,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -144,7 +138,7 @@ Parameters: Description: en: 'The size of the instance system disk, in GiB. Value range: 20 to 500' zh-cn: 实例系统盘大小，单位为GiB，取值范围：20~500 - Default: 20 + Default: 40 MinValue: 20 MaxValue: 500 Resources: @@ -336,10 +330,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: Jenkins Configuration diff --git a/examples/elastic/existing-vpc-single-kafka.yml b/examples/elastic/existing-vpc-single-kafka.yml index e2c0101a..31387208 100644 --- a/examples/elastic/existing-vpc-single-kafka.yml +++ b/examples/elastic/existing-vpc-single-kafka.yml @@ -109,23 +109,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -186,7 +173,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd Resources: EcsInstanceGroup: Type: ALIYUN::ECS::InstanceGroup @@ -461,8 +455,8 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: - - VSwitchZoneId - VpcId + - VSwitchZoneId - VSwitchId - SecurityGroupId Label: @@ -471,13 +465,14 @@ Metadata: zh-cn: 基础资源配置（必填） - Parameters: - InstanceType - - InstancePassword + - InstanceImageId - BindWidth - DiskCategory - DiskSize - ListenPort - MsgTime - TopicClass + - InstancePassword Label: default: en: Kafka Configuration diff --git a/examples/elastic/existing-vpc-single-map-reduce.yml b/examples/elastic/existing-vpc-single-map-reduce.yml index 1b8f2935..df867c17 100644 --- a/examples/elastic/existing-vpc-single-map-reduce.yml +++ b/examples/elastic/existing-vpc-single-map-reduce.yml @@ -83,7 +83,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -118,23 +125,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -422,10 +416,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: MapReduce Configuration diff --git a/examples/elastic/existing-vpc-single-rabbitmq.yml b/examples/elastic/existing-vpc-single-rabbitmq.yml index 4aba7ee4..b8c2802f 100644 --- a/examples/elastic/existing-vpc-single-rabbitmq.yml +++ b/examples/elastic/existing-vpc-single-rabbitmq.yml @@ -89,13 +89,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId SystemDiskSize: Type: Number Label: @@ -264,8 +261,8 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: - - VSwitchZoneId - VPC + - VSwitchZoneId - VSwitch - SecurityGroup Label: diff --git a/examples/elastic/existing-vpc-single-spark.yml b/examples/elastic/existing-vpc-single-spark.yml index d4ab4767..d2a1c5e4 100644 --- a/examples/elastic/existing-vpc-single-spark.yml +++ b/examples/elastic/existing-vpc-single-spark.yml @@ -82,7 +82,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -117,23 +124,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -481,10 +475,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: Spark Configuration diff --git a/examples/elastic/existing-vpc-single-storm.yml b/examples/elastic/existing-vpc-single-storm.yml index 645d81e3..45c2f4ce 100644 --- a/examples/elastic/existing-vpc-single-storm.yml +++ b/examples/elastic/existing-vpc-single-storm.yml @@ -82,7 +82,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -117,23 +124,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -390,10 +384,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: Storm Configuration diff --git a/examples/elastic/existing-vpc-single-yarn.yml b/examples/elastic/existing-vpc-single-yarn.yml index 7a74fd03..7ef5c2c5 100644 --- a/examples/elastic/existing-vpc-single-yarn.yml +++ b/examples/elastic/existing-vpc-single-yarn.yml @@ -82,7 +82,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -127,13 +134,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -388,10 +392,10 @@ Metadata: - Parameters: - InstanceType - InstanceImageId - - InstancePassword - BindWidth - DiskCategory - DiskSize + - InstancePassword Label: default: en: YARN Configuration diff --git a/examples/elastic/existing-vpc-single-zookeeper.yml b/examples/elastic/existing-vpc-single-zookeeper.yml index 1435dd22..5db1beb9 100644 --- a/examples/elastic/existing-vpc-single-zookeeper.yml +++ b/examples/elastic/existing-vpc-single-zookeeper.yml @@ -80,23 +80,10 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId SystemDiskSize: Type: Number Label: @@ -105,7 +92,7 @@ Parameters: Description: en: 'System disk size, range of values: 20-500, units: GB.' zh-cn: 系统盘大小, 取值范围：[20, 500], 单位：GB。 - Default: 20 + Default: 40 ZookeeperServerPort: Type: Number Label: @@ -344,8 +331,8 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: - - VSwitchZoneId - VPC + - VSwitchZoneId - VSwitch - SecurityGroup Label: diff --git a/examples/elastic/hadoop-distributed-ecs-instance-group.yml b/examples/elastic/hadoop-distributed-ecs-instance-group.yml index 719210ad..82b53a4d 100644 --- a/examples/elastic/hadoop-distributed-ecs-instance-group.yml +++ b/examples/elastic/hadoop-distributed-ecs-instance-group.yml @@ -63,23 +63,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: ECS系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId ImageId: Type: String Label: @@ -91,7 +78,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd SlaveAmount: Type: Number Label: diff --git a/examples/elastic/hadoop-distributed-env-3-ecs.yml b/examples/elastic/hadoop-distributed-env-3-ecs.yml index d115eb42..eac99f20 100644 --- a/examples/elastic/hadoop-distributed-env-3-ecs.yml +++ b/examples/elastic/hadoop-distributed-env-3-ecs.yml @@ -88,23 +88,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: ECS系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId ImageId: Type: String Label: @@ -116,7 +103,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -181,7 +175,7 @@ Parameters: Description: en: The official download path of .tar.gz zh-cn: .tar.gz的官方下载路径 - Default: https://archive.apache.org/dist/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz + Default: https://ros-template-resources.oss-cn-beijing.aliyuncs.com/Hadoop/hadoop-2.7.7.tar.gz Resources: EipSNat: Type: ALIYUN::VPC::EIP diff --git a/examples/elastic/hadoop-pseudo-distributed-env.yml b/examples/elastic/hadoop-pseudo-distributed-env.yml index a20db677..a52b8899 100644 --- a/examples/elastic/hadoop-pseudo-distributed-env.yml +++ b/examples/elastic/hadoop-pseudo-distributed-env.yml @@ -88,23 +88,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: ECS系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId ImageId: Type: String Label: @@ -116,7 +103,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -161,10 +155,7 @@ Parameters: Description: en: The official download path of .tar.gz zh-cn: .tar.gz的官方下载路径 - Default: https://mirrors.tuna.tsinghua.edu.cn/apache/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz - AllowedValues: - - https://mirrors.tuna.tsinghua.edu.cn/apache/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz - - http://apache.claz.org/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz + Default: https://ros-template-resources.oss-cn-beijing.aliyuncs.com/Hadoop/hadoop-2.7.7.tar.gz Resources: Vpc: Type: ALIYUN::ECS::VPC diff --git a/examples/elastic/instance-image-disk-snapshot.yml b/examples/elastic/instance-image-disk-snapshot.yml index dd336262..1ef6bbfc 100644 --- a/examples/elastic/instance-image-disk-snapshot.yml +++ b/examples/elastic/instance-image-disk-snapshot.yml @@ -22,6 +22,7 @@ Parameters: en: The existing security group ID that the ECS instance belongs to. net type is classic. zh-cn: ECS实例所属的现有安全组ID。网络类型是经典的。 + AssociationProperty: ALIYUN::ECS::SecurityGroup::SecurityGroupId SnapshotId: Type: String Label: @@ -30,6 +31,7 @@ Parameters: Description: en: ID of the snapshot to create the volume. zh-cn: 创建卷的快照的ID。 + AssociationProperty: ALIYUN::ECS::Snapshot::SnapshotId DiskName: Type: String Label: @@ -51,6 +53,15 @@ Parameters: be equal to or greater than the specific snapshot.' zh-cn: 磁盘大小，单位为GB。值范围：cloud:[5-2000]、cloud_efficiency:[20-32768]、cloud_ssd:[20-32768]、ephemeral_ssd:[5-800]。该值应等于或大于特定快照。 Default: 20 + ZoneId: + Type: String + Label: + en: Zone ID + zh-cn: 可用区 + Description: + en: Availability ID + zh-cn: 可用区ID + AssociationProperty: ALIYUN::ECS::Instance::ZoneId ImageId: Type: String Label: @@ -62,7 +73,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceName: Type: String Label: @@ -84,6 +102,8 @@ Parameters: zh-cn: ECS实例类型，请选择经典网络类型规格并确保可用，查看实例类型 AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: ZoneId InternetChargeType: Type: String Label: @@ -92,6 +112,8 @@ Parameters: Description: en: The charge type of public internet instance zh-cn: 实例的收费类型，paybytraffic：按流量付费，paybybandwidth：按带宽付费 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -111,13 +133,9 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType MaxAmount: Type: Number Label: @@ -210,14 +228,15 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: + - ZoneId - AllocatePublicIP - SecurityGroupId - SnapshotId - DiskName - DiskSize + - InstanceType - ImageId - InstanceName - - InstanceType - InternetChargeType - SystemDiskCategory - MaxAmount diff --git a/examples/elastic/jdk-dns-ssh-without-password-3-ecs.yml b/examples/elastic/jdk-dns-ssh-without-password-3-ecs.yml index 5d0f8d49..030487da 100644 --- a/examples/elastic/jdk-dns-ssh-without-password-3-ecs.yml +++ b/examples/elastic/jdk-dns-ssh-without-password-3-ecs.yml @@ -67,7 +67,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -88,23 +95,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: ECS系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId InstancePassword: Type: String Label: @@ -613,8 +607,8 @@ Metadata: - Parameters: - ZoneId - InstanceName - - ImageId - InstanceType + - ImageId - SystemDiskCategory - InstancePassword Label: diff --git a/examples/elastic/kong-single-instance.yml b/examples/elastic/kong-single-instance.yml index d5d45ea6..df193cfd 100644 --- a/examples/elastic/kong-single-instance.yml +++ b/examples/elastic/kong-single-instance.yml @@ -51,23 +51,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId InstancePassword: Type: String Label: diff --git a/examples/elastic/lnmp-basic.yml b/examples/elastic/lnmp-basic.yml index 25de2cee..2e9d13fa 100644 --- a/examples/elastic/lnmp-basic.yml +++ b/examples/elastic/lnmp-basic.yml @@ -76,16 +76,7 @@ Parameters: Label: en: System Disk Category zh-cn: 系统磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory AssociationPropertyMetadata: LocaleKey: DiskCategory InstanceType: ${InstanceType} diff --git a/examples/elastic/lnmpa-basic.yml b/examples/elastic/lnmpa-basic.yml index 710c758e..527eb68d 100644 --- a/examples/elastic/lnmpa-basic.yml +++ b/examples/elastic/lnmpa-basic.yml @@ -101,13 +101,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId InstancePassword: Type: String Label: diff --git a/examples/elastic/lnmt-basic.yml b/examples/elastic/lnmt-basic.yml index 50a7352e..d9b1e5ae 100644 --- a/examples/elastic/lnmt-basic.yml +++ b/examples/elastic/lnmt-basic.yml @@ -62,7 +62,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 请使用Centos7, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -351,8 +358,8 @@ Metadata: en: Infrastructure Configuration zh-cn: 基础资源配置配置 - Parameters: - - ImageId - InstanceType + - ImageId - SystemDiskCategory - InstancePassword - NginxDownloadUrl diff --git a/examples/elastic/mount-multiple-noninit-data-disks.yml b/examples/elastic/mount-multiple-noninit-data-disks.yml index a6ba3caf..8366c159 100644 --- a/examples/elastic/mount-multiple-noninit-data-disks.yml +++ b/examples/elastic/mount-multiple-noninit-data-disks.yml @@ -75,7 +75,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_6 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -129,23 +136,10 @@ Parameters: Label: en: First Data Disk Category zh-cn: 数据盘1的磁盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} SecondDataDiskName: Type: String Label: @@ -161,23 +155,10 @@ Parameters: Label: en: Second Data Disk Category zh-cn: 数据盘2的磁盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} SecondDataDiskSize: Type: Number Label: @@ -215,23 +196,10 @@ Parameters: Label: en: System Disk Type zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId Password: Type: String Label: @@ -522,8 +490,8 @@ Metadata: en: Infrastructure Configuration zh-cn: 基础资源配置（必填） - Parameters: - - ImageId - InstanceType + - ImageId - FirstDataDiskName - FirstDataDiskSize - FirstDataDiskCategory diff --git a/examples/elastic/new-vpc-single-kafka.yml b/examples/elastic/new-vpc-single-kafka.yml index 06f95691..342a0ef3 100644 --- a/examples/elastic/new-vpc-single-kafka.yml +++ b/examples/elastic/new-vpc-single-kafka.yml @@ -99,23 +99,10 @@ Parameters: Label: en: Disk Type zh-cn: 磁盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId DiskSize: Type: Number Label: @@ -176,7 +163,14 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID, 详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd Resources: EcsVpc: Type: ALIYUN::ECS::VPC @@ -554,13 +548,14 @@ Metadata: zh-cn: 基础资源配置（必填） - Parameters: - InstanceType - - InstancePassword + - InstanceImageId - BindWidth - DiskCategory - DiskSize - ListenPort - MsgTime - TopicClass + - InstancePassword Label: default: en: Kafka Configuration diff --git a/examples/elastic/new-vpc-single-rabbitmq.yml b/examples/elastic/new-vpc-single-rabbitmq.yml index 00ec06da..cc393923 100644 --- a/examples/elastic/new-vpc-single-rabbitmq.yml +++ b/examples/elastic/new-vpc-single-rabbitmq.yml @@ -79,13 +79,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: VSwitchZoneId SystemDiskSize: Type: Number Label: @@ -94,7 +91,7 @@ Parameters: Description: en: 'System disk size, range of values: 20-500, units: GB.' zh-cn: 系统盘大小, 取值范围：[20, 500], 单位：GB。 - Default: 20 + Default: 40 Password: Type: String Label: diff --git a/examples/elastic/nodejs-single-instance.yml b/examples/elastic/nodejs-single-instance.yml index 40c08fe5..017b7bed 100644 --- a/examples/elastic/nodejs-single-instance.yml +++ b/examples/elastic/nodejs-single-instance.yml @@ -66,7 +66,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceName: Type: String Label: @@ -97,23 +104,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId InstancePassword: Type: String Label: @@ -305,9 +299,9 @@ Metadata: default: VPC - Parameters: - ZoneId - - ImageId - InstanceName - InstanceType + - ImageId - SystemDiskCategory - InstancePassword Label: diff --git a/examples/elastic/one-ecs-attach-multiple-slb.yml b/examples/elastic/one-ecs-attach-multiple-slb.yml index d8ca9d80..3408a73f 100644 --- a/examples/elastic/one-ecs-attach-multiple-slb.yml +++ b/examples/elastic/one-ecs-attach-multiple-slb.yml @@ -66,7 +66,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -104,6 +111,8 @@ Parameters: en: Instance internet access charge type.Support 'PayByBandwidth' and 'PayByTraffic' only. Default is PayByTraffic zh-cn: 实例internet访问收费类型。仅支持'PayByBandwidth(按带宽付费)'和'PayByTraffic(按流量付费)'。默认为PayByTraffic + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -113,45 +122,19 @@ Parameters: Label: en: System Disk Category zh-cn: 系统盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId DataDiskCategory: Type: String Label: en: Data Disk Category zh-cn: 数据盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::DataDiskCategory + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + ZoneId: ${ZoneId} DataDiskSize: Type: Number Label: @@ -374,8 +357,8 @@ Metadata: Label: default: SLB - Parameters: - - ImageId - InstanceType + - ImageId - MaxAmount - InternetChargeType - SystemDiskCategory diff --git a/examples/elastic/rds-with-ecs-in-iplist.yml b/examples/elastic/rds-with-ecs-in-iplist.yml index c0578786..e48e6f02 100644 --- a/examples/elastic/rds-with-ecs-in-iplist.yml +++ b/examples/elastic/rds-with-ecs-in-iplist.yml @@ -63,7 +63,14 @@ Parameters: image resources zh-cn: 镜像ID，ECS实例的镜像资源, 查看镜像资源 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -112,23 +119,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统磁盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId Password: Type: String Label: @@ -146,6 +140,29 @@ Parameters: MinLength: 8 MaxLength: 30 NoEcho: true + Category: + AssociationPropertyMetadata: + LocaleKey: RDSCategory + Default: Null + Required: false + AllowedValues: + - Basic + - HighAvailability + - cluster + Label: + zh-cn: 实例系列 + en: Category + Type: String + EngineVersion: + Type: String + Label: + zh-cn: 数据库版本号 + en: EngineVersion + AssociationProperty: ALIYUN::RDS::Engine::EngineVersion + AssociationPropertyMetadata: + Engine: MySQL + Default: '8.0' + Required: true DBInstanceClass: Type: String Label: @@ -154,50 +171,13 @@ Parameters: Description: en: The RDS instance class. zh-cn: 数据库实例类型 - Default: rds.mysql.t1.small - AllowedValues: - - rds.mysql.t1.small - - rds.mys2.small - - rds.mys2.mid - - rds.mys2.standard - - rds.mys2.large - - rds.mys2.xlarge - - rds.mys2.2xlarge - - rds.mys2.4xlarge - - rds.mys2.8xlarge - - rds.mss1.small - - rds.mss1.mid - - rds.mss1.standard - - rds.mss1.large - - rds.mss1.xlarge - - rds.mss1.2xlarge - - rds.mss1.4xlarge - - rds.mss1.8xlarge - - rds.pg.t1.small - - rds.pg.s1.small - - rds.pg.s2.large - - rds.pg.s3.large - - rds.pg.c1.large - - rds.pg.c1.xlarge - - rds.ppas.s3.large - - rds.ppas.m1.medium - - rds.ppas.c1.xlarge - - rds.ppas.c2.xlarge - DBInstanceEngineAndVersion: - Type: String - Label: - en: Type And Version - zh-cn: 类型与版本号 - Description: - en: Database instance engine type, default is 'Mysql'.Support MySQL/SQLServer/PostgreSQL/PPAS/MariaDB - now. - zh-cn: 数据库实例引擎类型，默认为Mysql，现在支持Mysql/SQLServer/PostgreSQL/PPAS/MariaDB。 - Default: MySQL-5.6 - AllowedValues: - - MySQL-5.6 - - SQLServer-2008r2 - - PostgreSQL-9.4 - - PPAS-9.3 + AssociationProperty: ALIYUN::RDS::Instance::InstanceType + AssociationPropertyMetadata: + Engine: MySQL + Category: ${Category} + EngineVersion: ${EngineVersion} + ZoneId: ${VSwitchZoneId} + Default: rds.mysql.s1.small DBInstanceStorage: Type: Number Label: @@ -209,7 +189,7 @@ Parameters: ConstraintDescription: en: '[5, 2000] Incrementing in every 5G, unit: GB' zh-cn: '[5, 2000] 每 5G 递增，单位：GB' - Default: 5 + Default: 50 MinValue: 5 MaxValue: 2000 DBInstanceNetType: @@ -220,6 +200,8 @@ Parameters: Description: en: Instance Net Type zh-cn: 实例网络类型 + AssociationPropertyMetadata: + LocaleKey: NetType Default: Intranet AllowedValues: - Intranet @@ -301,18 +283,11 @@ Resources: Ref: DBInstanceNetType DBInstanceStorage: Ref: DBInstanceStorage - Engine: - Fn::Select: - - '0' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Engine: MySQL + Category: + Ref: Category EngineVersion: - Fn::Select: - - '1' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Ref: EngineVersion SecurityIPList: Fn::GetAtt: - WebServer @@ -375,8 +350,9 @@ Metadata: en: ECS zh-cn: 云服务器 - Parameters: + - Category + - EngineVersion - DBInstanceClass - - DBInstanceEngineAndVersion - DBInstanceStorage - DBInstanceNetType Label: diff --git a/examples/elastic/ruby-on-rails-single-instance.yml b/examples/elastic/ruby-on-rails-single-instance.yml index 8da77ac9..af1d92dc 100644 --- a/examples/elastic/ruby-on-rails-single-instance.yml +++ b/examples/elastic/ruby-on-rails-single-instance.yml @@ -95,24 +95,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${InstanceType} InstancePassword: Type: String Label: diff --git a/examples/elastic/scaling-simple-ha-infrastructure.yml b/examples/elastic/scaling-simple-ha-infrastructure.yml index ec631b1d..4d0af65b 100644 --- a/examples/elastic/scaling-simple-ha-infrastructure.yml +++ b/examples/elastic/scaling-simple-ha-infrastructure.yml @@ -34,6 +34,7 @@ Parameters: Description: en: The source ECS instance ID to be cloned zh-cn: 需要克隆的ECS实例ID + AssociationProperty: ALIYUN::ECS::Instance::InstanceId NewImageId: Type: String Label: @@ -45,7 +46,13 @@ Parameters: image resources zh-cn: '镜像ID，详情请参考: 公共镜像' - Default: ubuntu_14 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceName: Type: String Label: diff --git a/examples/elastic/simple-ecs-instance.yml b/examples/elastic/simple-ecs-instance.yml index d6ff7a0b..f8eae370 100644 --- a/examples/elastic/simple-ecs-instance.yml +++ b/examples/elastic/simple-ecs-instance.yml @@ -14,7 +14,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstanceType: Type: String Label: @@ -29,6 +36,8 @@ Parameters: href='https://help.aliyun.com/document_detail/25378.html' target='_blank'>实例规格族 AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: ZoneId Password: Type: String Label: @@ -127,8 +136,9 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: - - ImageId + - ZoneId - InstanceType + - ImageId - Password Label: default: ECS diff --git a/examples/elastic/simple-high-available-infrastructure.yml b/examples/elastic/simple-high-available-infrastructure.yml index cf718b44..abfbe189 100644 --- a/examples/elastic/simple-high-available-infrastructure.yml +++ b/examples/elastic/simple-high-available-infrastructure.yml @@ -16,7 +16,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: ubuntu_16 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${AppEcsInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd AppEcsInstanceType: Type: String Label: @@ -31,6 +38,8 @@ Parameters: href='https://help.aliyun.com/document_detail/25378.html' target='_blank'>实例规格族 AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: ZoneId AppEcsMaxAmount: Type: Number Label: @@ -48,23 +57,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: AppEcsInstanceType + ZoneId: ZoneId InstancePassword: Type: String Label: @@ -129,44 +125,41 @@ Parameters: AllowedPattern: '[a-z]{1}[a-z0-9_]*[a-z0-9]{1}' MinLength: '2' MaxLength: '16' + Category: + AssociationPropertyMetadata: + LocaleKey: RDSCategory + Default: Null + Required: false + AllowedValues: + - Basic + - HighAvailability + - cluster + Label: + zh-cn: 实例系列 + en: Category + Type: String + EngineVersion: + AssociationPropertyMetadata: + Engine: MySQL + Default: '8.0' + Required: true + Label: + zh-cn: 数据库版本号 + en: EngineVersion + AssociationProperty: ALIYUN::RDS::Engine::EngineVersion + Type: String DBInstanceClass: Type: String Label: en: DB Instance Class zh-cn: 数据库实例类型 - Description: - en: 'Select the instance specification based on the type of database engine - and the available area support;
see detail: Instance specification sheet' - zh-cn: 根据数据库引擎的类型和可用的区域支持选择实例规格；
请参见详细信息：实例规格表 - Default: rds.mysql.t1.small - AllowedValues: - - rds.mysql.t1.small - - rds.mysql.s1.small - - rds.mysql.s2.large - - rds.mysql.s2.xlarge - - rds.mysql.s3.large - - rds.mysql.m1.medium - - rds.mysql.c1.large - - rds.mysql.c1.xlarge - - rds.mysql.c2.xlarge - - rds.mysql.c2.xlp2 - DBInstanceEngineAndVersion: - Type: String - Label: - en: Instance Engine Type - zh-cn: 实例引擎类型 - Description: - en: Database instance engine type, default is 'Mysql'.Support MySQL/SQLServer/PostgreSQL/PPAS/MariaDB - now. - zh-cn: 数据库实例引擎类型，默认为Mysql，现在支持Mysql/SQLServer/PostgreSQL/PPAS/MariaDB。 - Default: MySQL-5.6 - AllowedValues: - - MySQL-5.6 - - SQLServer-2008r2 - - PostgreSQL-9.4 - - PPAS-9.3 + AssociationProperty: ALIYUN::RDS::Instance::InstanceType + AssociationPropertyMetadata: + Engine: MySQL + Category: ${Category} + EngineVersion: ${EngineVersion} + ZoneId: ${ZoneId} + Default: rds.mysql.s1.small DBInstanceStorage: Type: Number Label: @@ -176,7 +169,7 @@ Parameters: en: The size range of RDS instances is 20 - 2000, Incrementing in every 5, unit GB zh-cn: RDS实例大小范围为20-2000，每5个增量，单位为GB - Default: 20 + Default: 50 DBPassword: Type: String Label: @@ -342,29 +335,22 @@ Resources: DBInstanceClass: Ref: DBInstanceClass DBInstanceDescription: DataBase - DBInstanceStorage: - Ref: DBInstanceStorage DBMappings: - CharacterSetName: utf8 DBName: Ref: DBName - Engine: - Fn::Select: - - '0' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion - EngineVersion: - Fn::Select: - - '1' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + DBInstanceStorage: + Ref: DBInstanceStorage + Engine: MySQL MasterUserPassword: Ref: DBPassword + EngineVersion: + Ref: EngineVersion MasterUsername: Ref: DBUser MultiAZ: false + Category: + Ref: Category PreferredBackupPeriod: - Monday - Wednesday @@ -406,8 +392,9 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: - - AppEcsImageId + - ZoneId - AppEcsInstanceType + - AppEcsImageId - AppEcsMaxAmount - AppEcsSystemDiskCategory - InstancePassword @@ -420,8 +407,10 @@ Metadata: - Parameters: - DBName - DBUser + - Category + - EngineVersion + - DBInstanceStorage - DBInstanceClass - - DBInstanceEngineAndVersion - DBInstanceStorage - DBPassword Label: diff --git a/examples/elastic/slb-with-2-ecs.yml b/examples/elastic/slb-with-2-ecs.yml index c47cf7d8..c50c75bf 100644 --- a/examples/elastic/slb-with-2-ecs.yml +++ b/examples/elastic/slb-with-2-ecs.yml @@ -4,6 +4,16 @@ Description: instances, finally attach the 2 instances to the SLB.' zh-cn: 阿里云资源编排示例模板：首先创建一个SLB，然后创建2个ECS实例，最后将2个实例附加到SLB。 Parameters: + ZoneId: + Type: String + Label: + en: Zone ID + zh-cn: 可用区ID + Description: + en: The available zone ID, you should confirm the zone support ECS、VPC、VSwitch + or not. + zh-cn: 可用区ID，需确认所选可用区下是否支持ECS、VPC、VSwitch等资源。 + AssociationProperty: ALIYUN::ECS::Instance::ZoneId ECS_InternetChargeType: Type: String Label: @@ -12,6 +22,8 @@ Parameters: Description: en: The charge type of public internet ECS instance. zh-cn: 访问公网计费方式。 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: PayByTraffic AllowedValues: - PayByBandwidth @@ -32,40 +44,31 @@ Parameters: color='blue'>2.可选机型列表
[ecs.n1.large 2vCPU 4GiB]
[ecs.n1.xlarge 8vCPU 16GiB]
[ecs.n1.3xlarge 16vCPU 32GiB] + AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: ZoneId ImageId: Type: String Label: en: Image ID zh-cn: 镜像ID - Description: - en: 'Instance Image ID. see detail: Find the mirror' - zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd SystemDiskCategory: Type: String Label: en: System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_auto - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId Password: Type: String Label: @@ -115,6 +118,8 @@ Parameters: Description: en: The charge type of public internet SLB instance. zh-cn: 公网类型实例的付费方式。 + AssociationPropertyMetadata: + LocaleKey: InternetChargeType Default: paybytraffic AllowedValues: - paybybandwidth @@ -179,9 +184,23 @@ Resources: Metadata: ALIYUN::ROS::Designer: id: 51d1f6b6-f23d-4ac5-9911-16ea7161fe20 + Vpc: + Type: ALIYUN::ECS::VPC + Properties: + CidrBlock: 192.168.0.0/16 + VSwitch: + Type: ALIYUN::ECS::VSwitch + Properties: + ZoneId: + Ref: ZoneId + VpcId: + Ref: Vpc + CidrBlock: 192.168.1.0/24 securityGroup: Type: ALIYUN::ECS::SecurityGroup Properties: + VpcId: + Ref: Vpc SecurityGroupName: Ref: SecurityGroupName Metadata: @@ -190,6 +209,12 @@ Resources: EcsInstanceGroup: Type: ALIYUN::ECS::InstanceGroup Properties: + VpcId: + Fn::GetAtt: + - Vpc + - VpcId + VSwitchId: + Ref: VSwitch SecurityGroupId: Fn::GetAtt: - securityGroup @@ -246,6 +271,7 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: + - ZoneId - ECS_InternetChargeType - InstanceType - ImageId diff --git a/examples/elastic/spark-hadoop-distributed-env-3-ecs.yml b/examples/elastic/spark-hadoop-distributed-env-3-ecs.yml index 153e5161..ccc7fbff 100644 --- a/examples/elastic/spark-hadoop-distributed-env-3-ecs.yml +++ b/examples/elastic/spark-hadoop-distributed-env-3-ecs.yml @@ -97,23 +97,10 @@ Parameters: Label: en: System Disk Category zh-cn: 系统盘类型 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId ImageId: Type: String Label: @@ -124,7 +111,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -189,7 +183,7 @@ Parameters: Description: en: The official download path of .tar.gz zh-cn: .tar.gz的官方下载路径 - Default: http://apache.claz.org/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz + Default: https://ros-template-resources.oss-cn-beijing.aliyuncs.com/Hadoop/hadoop-2.7.7.tar.gz ScalaHome: Type: String Label: diff --git a/examples/elastic/spark-hadoop-ecs-instance-group.yml b/examples/elastic/spark-hadoop-ecs-instance-group.yml index 3685d863..3b186a5a 100644 --- a/examples/elastic/spark-hadoop-ecs-instance-group.yml +++ b/examples/elastic/spark-hadoop-ecs-instance-group.yml @@ -98,23 +98,10 @@ Parameters: Label: en: Instance System Disk Category zh-cn: 系统磁盘类别 - Description: - en: 'Optional values:
[cloud_efficiency: - Efficient Cloud Disk]
[cloud_ssd: SSD - Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: - Cloud Disk]
[ephemeral_ssd: Local - SSD Cloud Disk]' - zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: - ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: - 本地SSD盘]' - Default: cloud_ssd - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: InstanceType + ZoneId: ZoneId ImageId: Type: String Label: @@ -125,7 +112,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd SlaveAmount: Type: Number Label: diff --git a/examples/elastic/tensorflow-deployment.yml b/examples/elastic/tensorflow-deployment.yml index b180a1d4..e36347aa 100644 --- a/examples/elastic/tensorflow-deployment.yml +++ b/examples/elastic/tensorflow-deployment.yml @@ -49,6 +49,8 @@ Parameters: 8GiB 内网带宽1.5Gbps 内网收发包50万PPS]
[ecs.c5.2xlarge 8vCPU 16GiB 内网带宽2.5Gbps 内网收发包80万PPS] AssociationProperty: ALIYUN::ECS::Instance::InstanceType + AssociationPropertyMetadata: + ZoneId: ZoneId EcsImageId: Type: String Label: @@ -59,7 +61,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: ubuntu_16 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${EcsInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd EcsPassword: Type: String Label: @@ -283,6 +292,7 @@ Metadata: ALIYUN::ROS::Interface: ParameterGroups: - Parameters: + - ZoneId - EcsAmount - GPUNodeZoneId - EcsInstanceType diff --git a/examples/elastic/wordpress-cluster-phpmyadmin.yml b/examples/elastic/wordpress-cluster-phpmyadmin.yml index 15cab1ec..2f3346b3 100644 --- a/examples/elastic/wordpress-cluster-phpmyadmin.yml +++ b/examples/elastic/wordpress-cluster-phpmyadmin.yml @@ -17,7 +17,13 @@ Parameters: en: 3 to 63 characters, not beginning and ending with a hyphen (-), can contain lowercase letters, Numbers and hyphens (-) zh-cn: 3 到 63 个字符，不以连字符 (-) 开头和结尾，可以包含小写字母、数字和连字符 (-) - Default: application-wordpress-oss + AssociationProperty: AutoCompleteInput + AssociationPropertyMetadata: + Length: 6 + Prefix: application-wordpress-oss- + CharacterClasses: + - Class: lowercase + min: 1 AllowedPattern: ^[a-z0-9]+[a-z0-9\-]*[a-z0-9]+$ MinLength: 3 MaxLength: 63 @@ -66,6 +72,13 @@ Parameters: target='_blank'>Find the mirror zh-cn: 镜像ID，详见： 查找镜像 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${JumpboxInstanceType} + SupportedImageOwnerAlias: + - system + - self + - others Default: centos_7_04_64_20G_alibase_201701015.vhd JumpboxDataDiskType: Type: String @@ -82,13 +95,10 @@ Parameters: color=''green''>高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' - Default: cloud_efficiency - AllowedValues: - - cloud_efficiency - - cloud_ssd - - cloud - - cloud_essd - - ephemeral_ssd + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + InstanceType: JumpboxInstanceType + ZoneId: ZoneId JumpboxDataDiskSize: Type: Number Label: @@ -137,6 +147,31 @@ Parameters: zh-cn: 实例规格，
详见：性能保障型 Default: slb.s1.small + Category: + AssociationPropertyMetadata: + LocaleKey: RDSCategory + Default: Null + Required: false + AllowedValues: + - Basic + - HighAvailability + - cluster + Label: + zh-cn: 实例系列 + en: Category + Type: String + EngineVersion: + Type: String + Label: + en: Engine Version + zh-cn: 数据库引擎版本 + Description: + en: RDS MySQL Engine Version + zh-cn: RDS MySQL 数据库版本号 + AssociationProperty: ALIYUN::RDS::Engine::EngineVersion + AssociationPropertyMetadata: + Engine: MySQL + Default: '8.0' DBInstanceClass: Type: String Label: @@ -148,20 +183,13 @@ Parameters: target=''_blank''>Instance specification sheet.' zh-cn: '根据数据库引擎类型和可用区域支持选择实例规格;
详见: 实例规格表.' + AssociationProperty: ALIYUN::RDS::Instance::InstanceType + AssociationPropertyMetadata: + Engine: MySQL + Category: ${Category} + EngineVersion: ${EngineVersion} + ZoneId: ${ZoneId} Default: rds.mysql.s1.small - DBInstanceEngineAndVersion: - Type: String - Label: - en: Engine - zh-cn: 引擎类型 - Description: - en: Database instance engine type, default is 'Mysql'. - zh-cn: 数据库引擎类型， 默认Mysql。 - Default: MySQL-5.6 - AllowedValues: - - MySQL-5.6 - - SQLServer-2008r2 - - PostgreSQL-9.4 DBInstanceNetType: Type: String Label: @@ -317,18 +345,11 @@ Resources: - CharacterSetName: utf8 DBName: Ref: DBName - Engine: - Fn::Select: - - '0' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Engine: MySQL + Category: + Ref: Category EngineVersion: - Fn::Select: - - '1' - - Fn::Split: - - '-' - - Ref: DBInstanceEngineAndVersion + Ref: EngineVersion MasterUserPassword: Ref: MasterDBPassword MasterUsername: @@ -1233,6 +1254,7 @@ Metadata: - JumpboxImageId - JumpboxDataDiskType - JumpboxDataDiskSize + - TotalDataDisk - MountPoint - JumpboxPassword Label: @@ -1242,8 +1264,9 @@ Metadata: Label: default: SLB - Parameters: + - Category + - EngineVersion - DBInstanceClass - - DBInstanceEngineAndVersion - DBInstanceNetType - DBInstanceStorage - DBName diff --git a/examples/elastic/wordpress-cluster.yml b/examples/elastic/wordpress-cluster.yml index 80d79188..803d4336 100644 --- a/examples/elastic/wordpress-cluster.yml +++ b/examples/elastic/wordpress-cluster.yml @@ -68,7 +68,14 @@ Parameters: target=''_blank''>Find the mirror' zh-cn: 实例镜像，详见：查找镜像 - Default: centos_7 + AssociationProperty: ALIYUN::ECS::Image::ImageId + AssociationPropertyMetadata: + InstanceType: ${InstanceType} + SupportedImageOwnerAlias: + - system + - self + - others + Default: centos_7_04_64_20G_alibase_201701015.vhd InstancePassword: Type: String Label: @@ -97,6 +104,19 @@ Parameters: Default: 3 MinValue: 1 MaxValue: 100 + SystemDiskCategory: + Type: String + Label: + en: System Disk Type + zh-cn: 系统盘类型 + Description: + en: 'Optional values:
[cloud_efficiency: Efficient Cloud Disk]
[cloud_ssd: SSD Cloud Disk]
[cloud_essd: ESSD Cloud Disk]
[cloud: Cloud Disk]
[ephemeral_ssd: Local SSD Cloud Disk]' + zh-cn: '可选值：
[cloud_efficiency: 高效云盘]
[cloud_ssd: SSD云盘]
[cloud_essd: ESSD云盘]
[cloud: 普通云盘]
[ephemeral_ssd: 本地SSD盘]' + AssociationProperty: ALIYUN::ECS::Disk::SystemDiskCategory + AssociationPropertyMetadata: + LocaleKey: DiskCategory + InstanceType: ${InstanceType} + ZoneId: ZoneId LoadBalancerSpec: Type: String Label: @@ -108,6 +128,19 @@ Parameters: zh-cn: 实例规格，
详见：性能保障型 Default: slb.s1.small + Category: + AssociationPropertyMetadata: + LocaleKey: RDSCategory + Default: Null + Required: false + AllowedValues: + - Basic + - HighAvailability + - cluster + Label: + zh-cn: 实例系列 + en: Category + Type: String DBInstanceClass: Type: String Label: @@ -118,18 +151,13 @@ Parameters: target='_blank'>View RDS resources type zh-cn: '数据库实例类型,
详见: 实例规格表.' - Default: rds.mysql.t1.small - AllowedValues: - - rds.mysql.t1.small - - rds.mysql.s1.small - - rds.mysql.s2.large - - rds.mysql.s2.xlarge - - rds.mysql.s3.large - - rds.mysql.m1.medium - - rds.mysql.c1.large - - rds.mysql.c1.xlarge - - rds.mysql.c2.xlarge - - rds.mysql.c2.xlp2 + AssociationProperty: ALIYUN::RDS::Instance::InstanceType + AssociationPropertyMetadata: + Engine: MySQL + Category: ${Category} + EngineVersion: ${EngineVersion} + ZoneId: ${ZoneId} + Default: rds.mysql.s1.small EngineVersion: Type: String Label: @@ -138,12 +166,10 @@ Parameters: Description: en: RDS MySQL Engine Version zh-cn: RDS MySQL 数据库版本号 - Default: '5.6' - AllowedValues: - - '5.5' - - '5.6' - - '5.7' - - '5.8' + AssociationProperty: ALIYUN::RDS::Engine::EngineVersion + AssociationPropertyMetadata: + Engine: MySQL + Default: '8.0' DBInstanceStorage: Type: Number Label: @@ -155,7 +181,7 @@ Parameters: ConstraintDescription: en: 'Incrementing in every 5G, unit: GB' zh-cn: 每5GB进行递增。 - Default: 5 + Default: 50 MinValue: 5 MaxValue: 2000 DBName: @@ -203,29 +229,6 @@ Parameters: MinLength: 8 MaxLength: 32 NoEcho: true - Engine: - Type: String - Label: - en: Engine Type - zh-cn: 数据库引擎类型 - Description: - en: Database instance engine type. - zh-cn: 数据库类型 - Default: MySQL - AllowedValues: - - MySQL - SLBInternetChargeType: - Type: String - Label: - en: Internet ChargeType - zh-cn: 公网付费方式 - Description: - en: The charge type of public internet SLB instance. - zh-cn: 公网类型实例的付费方式。 - Default: paybytraffic - AllowedValues: - - paybybandwidth - - paybytraffic Resources: LoadBalancer: Type: ALIYUN::SLB::LoadBalancer @@ -435,8 +438,9 @@ Resources: - CharacterSetName: utf8 DBName: Ref: DBName - Engine: - Ref: Engine + Engine: MySQL + Category: + Ref: Category EngineVersion: Ref: EngineVersion MasterUserPassword: @@ -486,7 +490,8 @@ Resources: Ref: NumberOfNode Password: Ref: InstancePassword - SystemDiskCategory: cloud_ssd + SystemDiskCategory: + Ref: SystemDiskCategory UserData: Fn::Replace: - ros-notify: @@ -656,8 +661,9 @@ Metadata: - Parameters: - InstanceType - ImageId - - InstancePassword + - SystemDiskCategory - NumberOfNode + - InstancePassword Label: default: en: ECS @@ -669,8 +675,9 @@ Metadata: en: SLB zh-cn: 负载均衡 - Parameters: - - DBInstanceClass + - Category - EngineVersion + - DBInstanceClass - DBInstanceStorage - DBName - DBUser diff --git a/examples/isv/existing-vpc-slb-ecs-isv.yml b/examples/isv/existing-vpc-slb-ecs-isv.yml index 705de56d..f5ecb333 100644 --- a/examples/isv/existing-vpc-slb-ecs-isv.yml +++ b/examples/isv/existing-vpc-slb-ecs-isv.yml @@ -40,7 +40,7 @@ Parameters: zh-cn: 付费类型 AssociationProperty: ChargeType AssociationPropertyMetadata: - LocaleKey: InstanceChargeType + LocaleKey: InstanceChargeType``` Default: PostPaid AllowedValues: - PostPaid