Commit 24dba568 authored by baldwinlouie's avatar baldwinlouie Committed by Yas Naoi
Browse files

Issue #3309981 by baldwinlouie, yas: Allow all instance type selections in the... 

Issue #3309981 by baldwinlouie, yas: Allow all instance type selections in the master CFn templates to pass to the nested EC2 template unrestricted
parent c76fd1d0

deployments/cfn/nested/ec2/ami/template.yaml

+0 −40
Original line number Diff line number Diff line
@@ -31,46 +31,6 @@ Parameters: 
    Description: The EC2 instance type.

    Type: String

    Default: t3.medium

    AllowedValues:

      - t3.medium

      - t3.large

      - t3.xlarge

      - t3.2xlarge

      - m5.large

      - m5.xlarge

      - m5.2xlarge

      - m5.4xlarge

      - m5.8xlarge

      - m5.12xlarge

      - m5.16xlarge

      - m5.24xlarge

      - c5.large

      - c5.xlarge

      - c5.2xlarge

      - c5.4xlarge

      - c5.9xlarge

      - c5.12xlarge

      - c5.18xlarge

      - c5.24xlarge

      - r5.large

      - r5.xlarge

      - r5.2xlarge

      - r5.4xlarge

      - r5.8xlarge

      - r5.12xlarge

      - r5.16xlarge

      - r5.24xlarge

      - d2.xlarge

      - d2.2xlarge

      - d2.4xlarge

      - d2.8xlarge

      - i3.large

      - i3.xlarge

      - i3.2xlarge

      - i3.4xlarge

      - i3.8xlarge

      - i3.16xlarge

    ConstraintDescription: Must be a valid EC2 instance type.

  PublicSubnet1:

    Description: Public Subnet 1

    Type: String

deployments/cfn/nested/ec2/docker/template.yaml

+0 −40
Original line number Diff line number Diff line
@@ -32,46 +32,6 @@ Parameters: 
    Description: The EC2 instance type.

    Type: String

    Default: t3.medium

    AllowedValues:

      - t3.medium

      - t3.large

      - t3.xlarge

      - t3.2xlarge

      - m5.large

      - m5.xlarge

      - m5.2xlarge

      - m5.4xlarge

      - m5.8xlarge

      - m5.12xlarge

      - m5.16xlarge

      - m5.24xlarge

      - c5.large

      - c5.xlarge

      - c5.2xlarge

      - c5.4xlarge

      - c5.9xlarge

      - c5.12xlarge

      - c5.18xlarge

      - c5.24xlarge

      - r5.large

      - r5.xlarge

      - r5.2xlarge

      - r5.4xlarge

      - r5.8xlarge

      - r5.12xlarge

      - r5.16xlarge

      - r5.24xlarge

      - d2.xlarge

      - d2.2xlarge

      - d2.4xlarge

      - d2.8xlarge

      - i3.large

      - i3.xlarge

      - i3.2xlarge

      - i3.4xlarge

      - i3.8xlarge

      - i3.16xlarge

    ConstraintDescription: Must be a valid EC2 instance type.

  DrupalUserName:

    Default: cloud_admin

    Description: >-

deployments/cfn/nested/ec2/docker_rds/template.yaml

+0 −40
Original line number Diff line number Diff line
@@ -32,46 +32,6 @@ Parameters: 
    Description: The EC2 instance type.

    Type: String

    Default: t3.medium

    AllowedValues:

      - t3.medium

      - t3.large

      - t3.xlarge

      - t3.2xlarge

      - m5.large

      - m5.xlarge

      - m5.2xlarge

      - m5.4xlarge

      - m5.8xlarge

      - m5.12xlarge

      - m5.16xlarge

      - m5.24xlarge

      - c5.large

      - c5.xlarge

      - c5.2xlarge

      - c5.4xlarge

      - c5.9xlarge

      - c5.12xlarge

      - c5.18xlarge

      - c5.24xlarge

      - r5.large

      - r5.xlarge

      - r5.2xlarge

      - r5.4xlarge

      - r5.8xlarge

      - r5.12xlarge

      - r5.16xlarge

      - r5.24xlarge

      - d2.xlarge

      - d2.2xlarge

      - d2.4xlarge

      - d2.8xlarge

      - i3.large

      - i3.xlarge

      - i3.2xlarge

      - i3.4xlarge

      - i3.8xlarge

      - i3.16xlarge

    ConstraintDescription: Must be a valid EC2 instance type.

  DrupalUserName:

    Default: cloud_admin

    Description: >-

deployments/cfn/nested/ec2/full/template.yaml

+0 −40
Original line number Diff line number Diff line
@@ -32,46 +32,6 @@ Parameters: 
    Description: The EC2 instance type.

    Type: String

    Default: t3.medium

    AllowedValues:

      - t3.medium

      - t3.large

      - t3.xlarge

      - t3.2xlarge

      - m5.large

      - m5.xlarge

      - m5.2xlarge

      - m5.4xlarge

      - m5.8xlarge

      - m5.12xlarge

      - m5.16xlarge

      - m5.24xlarge

      - c5.large

      - c5.xlarge

      - c5.2xlarge

      - c5.4xlarge

      - c5.9xlarge

      - c5.12xlarge

      - c5.18xlarge

      - c5.24xlarge

      - r5.large

      - r5.xlarge

      - r5.2xlarge

      - r5.4xlarge

      - r5.8xlarge

      - r5.12xlarge

      - r5.16xlarge

      - r5.24xlarge

      - d2.xlarge

      - d2.2xlarge

      - d2.4xlarge

      - d2.8xlarge

      - i3.large

      - i3.xlarge

      - i3.2xlarge

      - i3.4xlarge

      - i3.8xlarge

      - i3.16xlarge

    ConstraintDescription: Must be a valid EC2 instance type.

  DrupalUserName:

    Default: cloud_admin

    Description: >-