openstack/deb-heat
Code Issues Proposed changes

heat templates : Update for F18

Browse Source 
Remove F16 as it's EOL, update with F18 as it's the current
version.  Leave the default as F17 for now in all except the
Openshift templates (because Openshift doesn't work on F17,
although these templates are currently broken anyway..)

fixes bug 1154121

Change-Id: Ia95e6bfb4a15e355dfb0051d57f5b70a408551c6
This commit is contained in:
Steven Hardy 2013-03-12 14:39:11 +00:00
parent 16cd2030aa
commit b2e15ce1f7
28 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/AutoScalingMultiAZSample.template
View File

@ -65,7 +65,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -83,7 +83,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/EC2WithEBSSample.template
View File

@ -31,7 +31,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -49,7 +49,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/HAProxy_Single_Instance.template
View File

@ -27,7 +27,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -45,7 +45,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

2
templates/InstanceGroup.template
View File

@ -18,7 +18,7 @@
"ImageId" : { "ImageId" : {
"Description" : "Name of the image to use", "Description" : "Name of the image to use",
"Type" : "String", "Type" : "String",
"Default" : "F16-x86_64-cfntools" "Default" : "F17-x86_64-cfntools"
}, },
"NumInstances": { "NumInstances": {
"Default": "1", "Default": "1",

4
templates/MySQL_Single_Instance.template
View File

@ -58,7 +58,7 @@
"LinuxDistribution": { "LinuxDistribution": {
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ], "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ],
"Default": "F17" "Default": "F17"
} }
}, },
@ -77,7 +77,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

6
templates/OpenShift.template
View File

@ -22,10 +22,10 @@
"ConstraintDescription" : "must be a valid EC2 instance type." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "Default": "F18",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -46,7 +46,7 @@
"cg1.4xlarge" : { "Arch" : "64HVM" } "cg1.4xlarge" : { "Arch" : "64HVM" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

6
templates/OpenShift_Prebuilt_JEOS.template
View File

@ -22,10 +22,10 @@
"ConstraintDescription" : "must be a valid EC2 instance type." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "Default": "F18",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -46,7 +46,7 @@
"cg1.4xlarge" : { "Arch" : "64HVM" } "cg1.4xlarge" : { "Arch" : "64HVM" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools-openshift", "64" : "F16-x86_64-cfntools-openshift" }, "F18" : { "32" : "F18-i386-cfntools-openshift", "64" : "F18-x86_64-cfntools-openshift" },
"F17" : { "32" : "F17-i386-cfntools-openshift", "64" : "F17-x86_64-cfntools-openshift" }, "F17" : { "32" : "F17-i386-cfntools-openshift", "64" : "F17-x86_64-cfntools-openshift" },
"U10" : { "32" : "U10-i386-cfntools-openshift", "64" : "U10-x86_64-cfntools-openshift" }, "U10" : { "32" : "U10-i386-cfntools-openshift", "64" : "U10-x86_64-cfntools-openshift" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools-openshift", "64" : "rhel61-x86_64-cfntools-openshift" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools-openshift", "64" : "rhel61-x86_64-cfntools-openshift" },

4
templates/PuppetMaster_Single_Instance.template
View File

@ -29,7 +29,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
"Mappings" : { "Mappings" : {
@ -46,7 +46,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

2
templates/Rails_Single_Instance.template
View File

@ -85,7 +85,7 @@
"us-west-2" : { "32" : "ami-38fe7308", "64" : "ami-30fe7300", "64HVM" : "NOT_YET_SUPPORTED" }, "us-west-2" : { "32" : "ami-38fe7308", "64" : "ami-30fe7300", "64HVM" : "NOT_YET_SUPPORTED" },
"us-west-1" : { "32" : "ami-11d68a54", "64" : "ami-1bd68a5e", "64HVM" : "NOT_YET_SUPPORTED" }, "us-west-1" : { "32" : "ami-11d68a54", "64" : "ami-1bd68a5e", "64HVM" : "NOT_YET_SUPPORTED" },
"eu-west-1" : { "32" : "ami-973b06e3", "64" : "ami-953b06e1", "64HVM" : "NOT_YET_SUPPORTED" }, "eu-west-1" : { "32" : "ami-973b06e3", "64" : "ami-953b06e1", "64HVM" : "NOT_YET_SUPPORTED" },
"ap-southeast-1" : { "32" : "ami-b4b0cae6", "64" : "F16-x86_64-cfntools", "64HVM" : "NOT_YET_SUPPORTED" }, "ap-southeast-1" : { "32" : "ami-b4b0cae6", "64" : "F17-x86_64-cfntools", "64HVM" : "NOT_YET_SUPPORTED" },
"ap-northeast-1" : { "32" : "ami-0644f007", "64" : "ami-0a44f00b", "64HVM" : "NOT_YET_SUPPORTED" }, "ap-northeast-1" : { "32" : "ami-0644f007", "64" : "ami-0a44f00b", "64HVM" : "NOT_YET_SUPPORTED" },
"sa-east-1" : { "32" : "ami-3e3be423", "64" : "ami-3c3be421", "64HVM" : "NOT_YET_SUPPORTED" } "sa-east-1" : { "32" : "ami-3e3be423", "64" : "ami-3c3be421", "64HVM" : "NOT_YET_SUPPORTED" }
} }

4
templates/WordPress_2_Instances.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_2_Instances_With_EBS.template
View File

@ -73,7 +73,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -91,7 +91,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_2_Instances_With_EBS_EIP.template
View File

@ -73,7 +73,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -91,7 +91,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_And_Http.template
View File

@ -61,7 +61,7 @@
"Default": "F17", "Default": "F17",
"Description": "Distribution of choice", "Description": "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -79,7 +79,7 @@
"cc1.4xlarge": { "Arch": "64" } "cc1.4xlarge": { "Arch": "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32": "F16-i386-cfntools", "64": "F16-x86_64-cfntools" }, "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" }, "F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" },
"U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" }, "U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
"RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" }, "RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },

4
templates/WordPress_Composed_Instances.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_NoKey.template
View File

@ -59,7 +59,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -77,7 +77,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-gold", "64" : "F16-x86_64-gold" }, "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" },
"F17" : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" }, "F17" : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" },
"U10" : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" }, "U10" : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
"RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" }, "RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },

4
templates/WordPress_Single_Instance.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance.yaml
View File

@ -35,7 +35,7 @@ Parameters:
Default: F17 Default: F17
Description: Distribution of choice Description: Distribution of choice
Type: String Type: String
AllowedValues: [F16, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3] AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3]
Mappings: Mappings:
AWSInstanceType2Arch: AWSInstanceType2Arch:
t1.micro: {Arch: '32'} t1.micro: {Arch: '32'}
@ -49,7 +49,7 @@ Mappings:
c1.xlarge: {Arch: '64'} c1.xlarge: {Arch: '64'}
cc1.4xlarge: {Arch: '64'} cc1.4xlarge: {Arch: '64'}
DistroArch2AMI: DistroArch2AMI:
F16: {'32': F16-i386-cfntools, '64': F16-x86_64-cfntools} F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools}
F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools}
U10: {'32': U10-i386-cfntools, '64': U10-x86_64-cfntools} U10: {'32': U10-i386-cfntools, '64': U10-x86_64-cfntools}
RHEL-6.1: {'32': rhel61-i386-cfntools, '64': rhel61-x86_64-cfntools} RHEL-6.1: {'32': rhel61-i386-cfntools, '64': rhel61-x86_64-cfntools}

4
templates/WordPress_Single_Instance_With_EBS.template
View File

@ -73,7 +73,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -91,7 +91,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_EBS_EIP.template
View File

@ -73,7 +73,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -91,7 +91,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_EIP.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_HA.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
}, },
"HupPollInterval": { "HupPollInterval": {
"Default": "1", "Default": "1",
@ -87,7 +87,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
}, },
"HupPollInterval": { "HupPollInterval": {
"Default": "1", "Default": "1",
@ -87,7 +87,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_IHA.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
}, },
"HupPollInterval": { "HupPollInterval": {
"Default": "1", "Default": "1",
@ -87,7 +87,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_With_Quantum.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

4
templates/WordPress_Single_Instance_gold.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-gold", "64" : "F16-x86_64-gold" }, "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" },
"F17" : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" }, "F17" : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" },
"U10" : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" }, "U10" : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
"RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" }, "RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },

4
templates/WordPress_With_LB.template
View File

@ -64,7 +64,7 @@
"Default": "F17", "Default": "F17",
"Description": "Distribution of choice", "Description": "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -82,7 +82,7 @@
"cc1.4xlarge" : { "Arch": "64" } "cc1.4xlarge" : { "Arch": "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32": "F16-i386-cfntools", "64": "F16-x86_64-cfntools" }, "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" }, "F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" },
"U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" }, "U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
"RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" }, "RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },

4
templates/WordPress_With_RDS.template
View File

@ -82,7 +82,7 @@
"Default": "F17", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
} }
}, },
@ -100,7 +100,7 @@
"cc1.4xlarge" : { "Arch" : "64" } "cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F16" : { "32" : "F16-i386-cfntools", "64" : "F16-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }, "F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }, "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

2
templates/getting_started.template
View File

@ -12,7 +12,7 @@
"Type" : "AWS::EC2::Instance", "Type" : "AWS::EC2::Instance",
"Properties" : { "Properties" : {
"KeyName" : { "Ref" : "KeyName" }, "KeyName" : { "Ref" : "KeyName" },
"ImageId" : "F16-x86_64-cfntools", "ImageId" : "F17-x86_64-cfntools",
"InstanceType": "m1.large", "InstanceType": "m1.large",
"UserData" : { "Fn::Base64" : "80" } "UserData" : { "Fn::Base64" : "80" }
} }