Change templates to launch F17 (not F16) by default

Change-Id: If8b97e85f2dca5251145a8eebb184e43e25a34ea
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index 1ff2c0e23ee669b61819f2cf3a6dca5ae86a3ae1..7b66e9a7c85d55cade7f5c79e9dd6b3def633c51 100644 (file)
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -172,7 +172,7 @@ class StackControllerTest(unittest.TestCase):
             u'updated_time': u'2012-07-09T09:13:11Z',
             u'parameters':{
             u'DBUsername': u'admin',
-            u'LinuxDistribution': u'F16',
+            u'LinuxDistribution': u'F17',
             u'InstanceType': u'm1.large',
             u'DBRootPassword': u'admin',
             u'DBPassword': u'admin',
@@ -213,7 +213,7 @@ class StackControllerTest(unittest.TestCase):
                 'Parameters':
                     [{'ParameterValue': u'admin',
                     'ParameterKey': u'DBUsername'},
-                    {'ParameterValue': u'F16',
+                    {'ParameterValue': u'F17',
                     'ParameterKey': u'LinuxDistribution'},
                     {'ParameterValue': u'm1.large',
                     'ParameterKey': u'InstanceType'},
@@ -258,7 +258,7 @@ class StackControllerTest(unittest.TestCase):
             u'updated_time': u'2012-07-09T09:13:11Z',
             u'parameters':{
             u'DBUsername': u'admin',
-            u'LinuxDistribution': u'F16',
+            u'LinuxDistribution': u'F17',
             u'InstanceType': u'm1.large',
             u'DBRootPassword': u'admin',
             u'DBPassword': u'admin',
@@ -296,7 +296,7 @@ class StackControllerTest(unittest.TestCase):
                 'Parameters':
                     [{'ParameterValue': u'admin',
                     'ParameterKey': u'DBUsername'},
-                    {'ParameterValue': u'F16',
+                    {'ParameterValue': u'F17',
                     'ParameterKey': u'LinuxDistribution'},
                     {'ParameterValue': u'm1.large',
                     'ParameterKey': u'InstanceType'},

diff --git a/heat/tests/test_engine_manager.py b/heat/tests/test_engine_manager.py
index ed637906854d3a20a68cb57db934b69c26ab42a9..75564ab0b2a237a4fb3d1e6986ba76df0f959da2 100644 (file)
--- a/heat/tests/test_engine_manager.py
+++ b/heat/tests/test_engine_manager.py
@@ -403,7 +403,7 @@ class stackManagerTest(unittest.TestCase):
             user_data = ev['resource_properties']['UserData']
             self.assertNotEqual(user_data.find('wordpress'), -1)
             self.assertEqual(ev['resource_properties']['ImageId'],
-                             'F16-x86_64-gold')
+                             'F17-x86_64-gold')
             self.assertEqual(ev['resource_properties']['InstanceType'],
                              'm1.large')
 

diff --git a/heat/tests/v1_1/fakes.py b/heat/tests/v1_1/fakes.py
index 8e222ca3e55c0a28ea2d9dd6b7297a746ccb2f28..55013ef7a8d1c39826904fab43362b9274a1680b 100644 (file)
--- a/heat/tests/v1_1/fakes.py
+++ b/heat/tests/v1_1/fakes.py
@@ -551,7 +551,7 @@ class FakeHTTPClient(base_client.HTTPClient):
         return (200, {'images': [
             {'id': 1, 'name': 'CentOS 5.2'},
             {'id': 2, 'name': 'My Server Backup'},
-            {'id': 3, 'name': 'F16-x86_64-gold'}
+            {'id': 3, 'name': 'F17-x86_64-gold'}
         ]})
 
     def get_images_detail(self, **kw):
@@ -579,7 +579,7 @@ class FakeHTTPClient(base_client.HTTPClient):
             },
             {
                 "id": 744,
-                "name": "F16-x86_64-gold",
+                "name": "F17-x86_64-gold",
                 "serverId": 9999,
                 "updated": "2010-10-10T12:00:00Z",
                 "created": "2010-08-10T12:00:00Z",

diff --git a/templates/MySQL_Single_Instance.template b/templates/MySQL_Single_Instance.template
index bf410abead1d483fda251cf1c77cb850b609e3f8..10d3d953dbdfe146236b548c7d7d1d15968e03a8 100644 (file)
--- a/templates/MySQL_Single_Instance.template
+++ b/templates/MySQL_Single_Instance.template
@@ -59,7 +59,7 @@
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ],
-      "Default": "F16"
+      "Default": "F17"
     }
   },
 

diff --git a/templates/PuppetMaster_Single_Instance.template b/templates/PuppetMaster_Single_Instance.template
index f52f659d9c4bfdc3549bce1abcfdefe4b53623a3..1d348c415dc93133c1d977623c4952dc0806a5e0 100644 (file)
--- a/templates/PuppetMaster_Single_Instance.template
+++ b/templates/PuppetMaster_Single_Instance.template
@@ -26,7 +26,7 @@
       "Type" : "String"
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_2_Instances.template b/templates/WordPress_2_Instances.template
index 5847a6448f8c11770a3c92815610521f60c0fd57..6ec34dcee885c9c37395477e721f3e2bf5893589 100644 (file)
--- a/templates/WordPress_2_Instances.template
+++ b/templates/WordPress_2_Instances.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_2_Instances_With_EBS.template b/templates/WordPress_2_Instances_With_EBS.template
index ada10c0fc4b506ef6faf9b7da894951c00b1cae1..71d6e150b4dd85465e003f8c5ee2a792279a3fde 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS.template
+++ b/templates/WordPress_2_Instances_With_EBS.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_2_Instances_With_EBS_EIP.template b/templates/WordPress_2_Instances_With_EBS_EIP.template
index 78fdcfccbdb9b73fcf378471967b2f46a56fefc4..fb668888ed31e5904b6d579295842ee586bfdbef 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS_EIP.template
+++ b/templates/WordPress_2_Instances_With_EBS_EIP.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_And_Http.template b/templates/WordPress_And_Http.template
index 52f52b5147dc9748cfdff5ec41d81414f19296e6..77e853e4d4a745ad281cbf7eb0d75158e06213c7 100644 (file)
--- a/templates/WordPress_And_Http.template
+++ b/templates/WordPress_And_Http.template
@@ -58,7 +58,7 @@
     },
 
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description": "Distribution of choice",
       "Type": "String",
       "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Composed_Instances.template b/templates/WordPress_Composed_Instances.template
index 422ca5ec31acb5e19a78914a12490c4d9d06ba4a..f7b28f5ef1d325132aa5dad5be466923a9bde97b 100644 (file)
--- a/templates/WordPress_Composed_Instances.template
+++ b/templates/WordPress_Composed_Instances.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 642a5bd79d2b7795e78d4e91d4cf80b696fbe750..c44377a7633c018f715caa54d5a38c760f300e16 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_With_EBS.template b/templates/WordPress_Single_Instance_With_EBS.template
index e243ff9ab81525b3f13fcd8411ba71601a3b98cf..931d41e69fe644d22c00c03e762b987a0c46ad82 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS.template
+++ b/templates/WordPress_Single_Instance_With_EBS.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_With_EBS_EIP.template b/templates/WordPress_Single_Instance_With_EBS_EIP.template
index 5651b0f2f208322d936048032c2ec0ce2b896ae1..549fafb222d0a9c0918433cf2125d53c938ff1a7 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EBS_EIP.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_With_EIP.template b/templates/WordPress_Single_Instance_With_EIP.template
index c234f383f13e73980fab3c6165343bee82f31467..f65220dba00fa46eee7a5d41fb32711de139372c 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EIP.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_With_HA.template b/templates/WordPress_Single_Instance_With_HA.template
index 8c00624c58080c035cee3d42fb2507e5d31772f4..a3c864ceb813278f091201876832956cd5128c57 100644 (file)
--- a/templates/WordPress_Single_Instance_With_HA.template
+++ b/templates/WordPress_Single_Instance_With_HA.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_With_IHA.template b/templates/WordPress_Single_Instance_With_IHA.template
index de61090cd78fa63dd29975807da8e3066cea5f42..1159c1a37a2eb035c02de88af374fccefde697da 100644 (file)
--- a/templates/WordPress_Single_Instance_With_IHA.template
+++ b/templates/WordPress_Single_Instance_With_IHA.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_Single_Instance_deb.template b/templates/WordPress_Single_Instance_deb.template
index 7dfa1a59428a0d8e4e2afb96a0744aedb8b39851..1207d18358d9bdd31a3d13b449b1cbd43d87699a 100644 (file)
--- a/templates/WordPress_Single_Instance_deb.template
+++ b/templates/WordPress_Single_Instance_deb.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : "U10"

diff --git a/templates/WordPress_Single_Instance_gold.template b/templates/WordPress_Single_Instance_gold.template
index b3d06afecf6e99ee9d8d212e8d9ce94c51584058..621e8a3311ef42e69923f9d41b7ac2b232901feb 100644 (file)
--- a/templates/WordPress_Single_Instance_gold.template
+++ b/templates/WordPress_Single_Instance_gold.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_With_LB.template b/templates/WordPress_With_LB.template
index a25353de429f9524a2dbf79619abaf4c532e0b7d..abcab381325ab15c25dfbbc549eeec0fea3d33c6 100644 (file)
--- a/templates/WordPress_With_LB.template
+++ b/templates/WordPress_With_LB.template
@@ -61,7 +61,7 @@
       "ConstraintDescription": "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description": "Distribution of choice",
       "Type": "String",
       "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

diff --git a/templates/WordPress_With_RDS.template b/templates/WordPress_With_RDS.template
index 9a1b865fcb591dcd8df92e015374d4264afb3f8d..bbf51357ea24f89cdbcba5c313fb488ff1569473 100644 (file)
--- a/templates/WordPress_With_RDS.template
+++ b/templates/WordPress_With_RDS.template
@@ -79,7 +79,7 @@
     },
 
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]