heat templates : Update for F18

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

diff --git a/templates/AutoScalingMultiAZSample.template b/templates/AutoScalingMultiAZSample.template
index fd433b5734bb7845b003c712d865bb02c08bd05f..cd9fb051d9471dcaca901acbfc52929859f661ed 100644 (file)
--- a/templates/AutoScalingMultiAZSample.template
+++ b/templates/AutoScalingMultiAZSample.template
@@ -65,7 +65,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/EC2WithEBSSample.template b/templates/EC2WithEBSSample.template
index f99096296449ad4c75e59d31561ada48c9cddd79..120bc5f46f4b27b04dbeebf585d7829c4a732c2b 100644 (file)
--- a/templates/EC2WithEBSSample.template
+++ b/templates/EC2WithEBSSample.template
@@ -31,7 +31,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/HAProxy_Single_Instance.template b/templates/HAProxy_Single_Instance.template
index ceb845f2a3c31332cec0a6a61818400962fe2259..b9564ee937eefbbab2a3ba3bb3df385eb77d8f9c 100644 (file)
--- a/templates/HAProxy_Single_Instance.template
+++ b/templates/HAProxy_Single_Instance.template
@@ -27,7 +27,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/InstanceGroup.template b/templates/InstanceGroup.template
index 98510a8f939b32b7d607872d923f775f977dddc2..9148b8cbbecc79a8efca98e98514dc8e16a54250 100644 (file)
--- a/templates/InstanceGroup.template
+++ b/templates/InstanceGroup.template
@@ -18,7 +18,7 @@
     "ImageId" : {
       "Description" : "Name of the image to use",
       "Type" : "String",
-      "Default" : "F16-x86_64-cfntools"
+      "Default" : "F17-x86_64-cfntools"
     },
     "NumInstances": {
       "Default": "1",

diff --git a/templates/MySQL_Single_Instance.template b/templates/MySQL_Single_Instance.template
index 10d3d953dbdfe146236b548c7d7d1d15968e03a8..24e9b9ed153f463f2b5b5a6c40ffa92f19762da5 100644 (file)
--- a/templates/MySQL_Single_Instance.template
+++ b/templates/MySQL_Single_Instance.template
@@ -58,7 +58,7 @@
     "LinuxDistribution": {
       "Description" : "Distribution of choice",
       "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"
     }
   },
@@ -77,7 +77,7 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/OpenShift.template b/templates/OpenShift.template
index 0448322161f7a25ada07641caa5caf64d5fc43a9..f7d312ea8ff2285051300631b0fe3dd1b926eeef 100644 (file)
--- a/templates/OpenShift.template
+++ b/templates/OpenShift.template
@@ -22,10 +22,10 @@
       "ConstraintDescription" : "must be a valid EC2 instance type."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F18",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/OpenShift_Prebuilt_JEOS.template b/templates/OpenShift_Prebuilt_JEOS.template
index 53a82ed8366656859c44669ef05a19e8fc6d2040..98fe78ca362c0b7a871c70b9f4aba758dc80ab1e 100644 (file)
--- a/templates/OpenShift_Prebuilt_JEOS.template
+++ b/templates/OpenShift_Prebuilt_JEOS.template
@@ -22,10 +22,10 @@
       "ConstraintDescription" : "must be a valid EC2 instance type."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F18",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "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" },

diff --git a/templates/PuppetMaster_Single_Instance.template b/templates/PuppetMaster_Single_Instance.template
index 754bbd5c1a22751a6c0e55e01ccee2e1ad9e8020..32d9d35df87a02e10fef904ca7e568b6678009af 100644 (file)
--- a/templates/PuppetMaster_Single_Instance.template
+++ b/templates/PuppetMaster_Single_Instance.template
@@ -29,7 +29,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" : {
@@ -46,7 +46,7 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/Rails_Single_Instance.template b/templates/Rails_Single_Instance.template
index 581fa071de32404ce32f9f80fb2e22a8aa4bf879..54ebebc28bcea83dbbe23058ae23ff40dadad929 100644 (file)
--- a/templates/Rails_Single_Instance.template
+++ b/templates/Rails_Single_Instance.template
@@ -85,7 +85,7 @@
       "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" },
       "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" },
       "sa-east-1"      : { "32" : "ami-3e3be423", "64" : "ami-3c3be421", "64HVM" : "NOT_YET_SUPPORTED" }
     }

diff --git a/templates/WordPress_2_Instances.template b/templates/WordPress_2_Instances.template
index 11283dfd03f54f2f8a4fc717722c300116200f3f..427ae972b45c70565bdf4478408814d9bb9fa528 100644 (file)
--- a/templates/WordPress_2_Instances.template
+++ b/templates/WordPress_2_Instances.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_2_Instances_With_EBS.template b/templates/WordPress_2_Instances_With_EBS.template
index 8eafe077e3cc98731340c8aed361193f9159dd1e..968b0aadbc38cd7d8da620c9ff6a1cb7671676ed 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS.template
+++ b/templates/WordPress_2_Instances_With_EBS.template
@@ -73,7 +73,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_2_Instances_With_EBS_EIP.template b/templates/WordPress_2_Instances_With_EBS_EIP.template
index 7807cf14ffefa71c907acac1365ed1741d8cca81..c6c31983edfe5d8e16787483130fe4813d4745eb 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS_EIP.template
+++ b/templates/WordPress_2_Instances_With_EBS_EIP.template
@@ -73,7 +73,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_And_Http.template b/templates/WordPress_And_Http.template
index 819469125a52bb62fde4de513b455df8e6ecd210..96573e7d0443f8004ac170c19b17e75a980cf3fc 100644 (file)
--- a/templates/WordPress_And_Http.template
+++ b/templates/WordPress_And_Http.template
@@ -61,7 +61,7 @@
       "Default": "F17",
       "Description": "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
       "RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Composed_Instances.template b/templates/WordPress_Composed_Instances.template
index 77ceeba54c17ed7a827363baf875629d12908cc8..77f31d47938c8d483b388e7896ab2a9293de3cbf 100644 (file)
--- a/templates/WordPress_Composed_Instances.template
+++ b/templates/WordPress_Composed_Instances.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_NoKey.template b/templates/WordPress_NoKey.template
index f739eeb64fc1ede4e494f763f144461cdb69d328..b9f2f925351a6526e6de3e792a6b80dbfedb0757 100644 (file)
--- a/templates/WordPress_NoKey.template
+++ b/templates/WordPress_NoKey.template
@@ -59,7 +59,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
       "RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 07d398b93b8ca37638351b29ce10a73395e57a06..da2b379f3fe7dbf7063e181cdef05cc2eb53f18d 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance.yaml b/templates/WordPress_Single_Instance.yaml
index db813f298d2482f3666597a9db1dba9a14145d27..2990c66d47950c1795a10e4afe67d605676a4f84 100644 (file)
--- a/templates/WordPress_Single_Instance.yaml
+++ b/templates/WordPress_Single_Instance.yaml
@@ -35,7 +35,7 @@ Parameters:
     Default: F17
     Description: Distribution of choice
     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:
   AWSInstanceType2Arch:
     t1.micro: {Arch: '32'}
@@ -49,7 +49,7 @@ Mappings:
     c1.xlarge: {Arch: '64'}
     cc1.4xlarge: {Arch: '64'}
   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}
     U10: {'32': U10-i386-cfntools, '64': U10-x86_64-cfntools}
     RHEL-6.1: {'32': rhel61-i386-cfntools, '64': rhel61-x86_64-cfntools}

diff --git a/templates/WordPress_Single_Instance_With_EBS.template b/templates/WordPress_Single_Instance_With_EBS.template
index 005a2955162dfea1639051df73e2eabe5240a54a..a8343988ec78fa5e28783ca36ba7e4852c89c365 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS.template
+++ b/templates/WordPress_Single_Instance_With_EBS.template
@@ -73,7 +73,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_EBS_EIP.template b/templates/WordPress_Single_Instance_With_EBS_EIP.template
index 84dd984a233587c0cbeed77db81c1f43f7432aaf..21fa1d38ba6c53f5e20ec9c43f55cec671afdfad 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EBS_EIP.template
@@ -73,7 +73,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_EIP.template b/templates/WordPress_Single_Instance_With_EIP.template
index cb55116d565149fd434e6827f76b5614470ca98b..e2dcbf83ff0becc8347656b04e18c1ea6d299cbe 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EIP.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_HA.template b/templates/WordPress_Single_Instance_With_HA.template
index e4a45c25f60acc16d7bd126629569ffd632a9f38..f31bcc76b11ce39b47b9c950212f9d6b8846c285 100644 (file)
--- a/templates/WordPress_Single_Instance_With_HA.template
+++ b/templates/WordPress_Single_Instance_With_HA.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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": {
       "Default": "1",
@@ -87,7 +87,7 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
index fcc74e0628f24fe241d9cb6870b29a5e5a23e56c..69ddb82b81a1cc9534566bb8bb17ad7e57146517 100644 (file)
--- a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
+++ b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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": {
       "Default": "1",
@@ -87,7 +87,7 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_IHA.template b/templates/WordPress_Single_Instance_With_IHA.template
index f99586c11c0f7c4a38497915da0b737760445dd9..7f715caa92c6d0500f4ba9e3beb7e9917c74237c 100644 (file)
--- a/templates/WordPress_Single_Instance_With_IHA.template
+++ b/templates/WordPress_Single_Instance_With_IHA.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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": {
       "Default": "1",
@@ -87,7 +87,7 @@
       "cc1.4xlarge" : { "Arch" : "64" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_With_Quantum.template b/templates/WordPress_Single_Instance_With_Quantum.template
index 1712cdc9064d8722bdd1a1a6f913cc094fbcb6d1..04a9c37e8f0e2dc6ea326ac9ca1a8b5e9b3f9119 100644 (file)
--- a/templates/WordPress_Single_Instance_With_Quantum.template
+++ b/templates/WordPress_Single_Instance_With_Quantum.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_Single_Instance_gold.template b/templates/WordPress_Single_Instance_gold.template
index 520b9fd1aa7e5210a4a9db40e19917a9bec9c743..f7690b743434faf312d81f13e073d0935dabacf3 100644 (file)
--- a/templates/WordPress_Single_Instance_gold.template
+++ b/templates/WordPress_Single_Instance_gold.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
       "RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },

diff --git a/templates/WordPress_With_LB.template b/templates/WordPress_With_LB.template
index 42d5ef704a34906797bb1e4bcb5d34633341333c..7616779cc2df7628512542a8dc64a93162184d7d 100644 (file)
--- a/templates/WordPress_With_LB.template
+++ b/templates/WordPress_With_LB.template
@@ -64,7 +64,7 @@
       "Default": "F17",
       "Description": "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"     : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
       "RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },

diff --git a/templates/WordPress_With_RDS.template b/templates/WordPress_With_RDS.template
index f616d85448197e29b3aa144f0856f4f25a00e32c..9884e88d7f99bd63b07ecc5d6339b1a3927f1a22 100644 (file)
--- a/templates/WordPress_With_RDS.template
+++ b/templates/WordPress_With_RDS.template
@@ -82,7 +82,7 @@
       "Default": "F17",
       "Description" : "Distribution of choice",
       "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" }
     },
     "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" },
       "U10"      : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
       "RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },

diff --git a/templates/getting_started.template b/templates/getting_started.template
index 31acfc478e44f50adbce221d66f2f7561a737a74..9cc19eb6640338ac3925ccb9c3a5622c1de65229 100644 (file)
--- a/templates/getting_started.template
+++ b/templates/getting_started.template
@@ -12,7 +12,7 @@
       "Type" : "AWS::EC2::Instance",
       "Properties" : {
         "KeyName" : { "Ref" : "KeyName" },
-        "ImageId" : "F16-x86_64-cfntools",
+        "ImageId" : "F17-x86_64-cfntools",
         "InstanceType": "m1.large",
         "UserData" : { "Fn::Base64" : "80" }
       }