openstack
/
heat-templates
Code Issues Proposed changes

Add all devstack nova instance types to F19 WordPress_NoKey 

Add the m1.micro, m1.nano, and m1.xlarge instance types to the
WordPress_NoKey sample.  In the process, any devstack type that
requires atleast 2048MB of ram are mapped to i386 images, and those
requiring more are mapped to x86_64 images.

Change-Id: I48e696697436cfc820a91aa2096c94aec06cd769
This commit is contained in:
Steven Dake 2013-10-05 13:42:29 -07:00
parent ff8e83afa2
commit 65e5eb639c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cfn/F19/WordPress_NoKey.yaml
View File

@ -5,11 +5,11 @@ Description: 'Heat WordPress template to support F19 with no SSH key requirement
to store the data.'
Parameters:
InstanceType:
Description: WebServer EC2 instance type
Description: Wiki server nova instance type
Type: String
Default: m1.small
AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge]
ConstraintDescription: must be a valid EC2 instance type.
AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.nano, m1.xlarge, m1.micro]
ConstraintDescription: must be a valid nova instance type.
DBName: {Default: wordpress, Description: The
WordPress database name, Type: String, MinLength: '1',
MaxLength: '64', AllowedPattern: '[a-zA-Z][a-zA-Z0-9]*',
@ -30,8 +30,10 @@ Parameters:
ConstraintDescription: must contain only alphanumeric characters.}
Mappings:
InstanceTypeToImage:
m1.nano: {Image: 'F19-i386-cfntools'}
m1.micro: {Image: 'F19-i386-cfntools'}
m1.tiny: {Image: 'F19-i386-cfntools'}
m1.small: {Image: 'F19-x86_64-cfntools'}
m1.small: {Image: 'F19-i386-cfntools'}
m1.medium: {Image: 'F19-x86_64-cfntools'}
m1.large: {Image: 'F19-x86_64-cfntools'}
m1.xlarge: {Image: 'F19-x86_64-cfntools'}