openstack/heat
Code Issues Proposed changes

Change templates to launch F17 (not F16) by default

Browse Source 
Change-Id: If8b97e85f2dca5251145a8eebb184e43e25a34ea
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-09-17 17:46:45 +02:00
parent 0ad5ab9748
commit e1c0b4eafc
20 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/tests/test_api_cfn_v1.py
View File

@ -172,7 +172,7 @@ class StackControllerTest(unittest.TestCase):
u'updated_time': u'2012-07-09T09:13:11Z', u'updated_time': u'2012-07-09T09:13:11Z',
u'parameters':{ u'parameters':{
u'DBUsername': u'admin', u'DBUsername': u'admin',
u'LinuxDistribution': u'F16', u'LinuxDistribution': u'F17',
u'InstanceType': u'm1.large', u'InstanceType': u'm1.large',
u'DBRootPassword': u'admin', u'DBRootPassword': u'admin',
u'DBPassword': u'admin', u'DBPassword': u'admin',
@ -213,7 +213,7 @@ class StackControllerTest(unittest.TestCase):
'Parameters': 'Parameters':
[{'ParameterValue': u'admin', [{'ParameterValue': u'admin',
'ParameterKey': u'DBUsername'}, 'ParameterKey': u'DBUsername'},
{'ParameterValue': u'F16', {'ParameterValue': u'F17',
'ParameterKey': u'LinuxDistribution'}, 'ParameterKey': u'LinuxDistribution'},
{'ParameterValue': u'm1.large', {'ParameterValue': u'm1.large',
'ParameterKey': u'InstanceType'}, 'ParameterKey': u'InstanceType'},
@ -258,7 +258,7 @@ class StackControllerTest(unittest.TestCase):
u'updated_time': u'2012-07-09T09:13:11Z', u'updated_time': u'2012-07-09T09:13:11Z',
u'parameters':{ u'parameters':{
u'DBUsername': u'admin', u'DBUsername': u'admin',
u'LinuxDistribution': u'F16', u'LinuxDistribution': u'F17',
u'InstanceType': u'm1.large', u'InstanceType': u'm1.large',
u'DBRootPassword': u'admin', u'DBRootPassword': u'admin',
u'DBPassword': u'admin', u'DBPassword': u'admin',
@ -296,7 +296,7 @@ class StackControllerTest(unittest.TestCase):
'Parameters': 'Parameters':
[{'ParameterValue': u'admin', [{'ParameterValue': u'admin',
'ParameterKey': u'DBUsername'}, 'ParameterKey': u'DBUsername'},
{'ParameterValue': u'F16', {'ParameterValue': u'F17',
'ParameterKey': u'LinuxDistribution'}, 'ParameterKey': u'LinuxDistribution'},
{'ParameterValue': u'm1.large', {'ParameterValue': u'm1.large',
'ParameterKey': u'InstanceType'}, 'ParameterKey': u'InstanceType'},

2
heat/tests/test_engine_manager.py
View File

@ -403,7 +403,7 @@ class stackManagerTest(unittest.TestCase):
user_data = ev['resource_properties']['UserData'] user_data = ev['resource_properties']['UserData']
self.assertNotEqual(user_data.find('wordpress'), -1) self.assertNotEqual(user_data.find('wordpress'), -1)
self.assertEqual(ev['resource_properties']['ImageId'], self.assertEqual(ev['resource_properties']['ImageId'],
'F16-x86_64-gold') 'F17-x86_64-gold')
self.assertEqual(ev['resource_properties']['InstanceType'], self.assertEqual(ev['resource_properties']['InstanceType'],
'm1.large') 'm1.large')

4
heat/tests/v1_1/fakes.py
View File

@ -551,7 +551,7 @@ class FakeHTTPClient(base_client.HTTPClient):
return (200, {'images': [ return (200, {'images': [
{'id': 1, 'name': 'CentOS 5.2'}, {'id': 1, 'name': 'CentOS 5.2'},
{'id': 2, 'name': 'My Server Backup'}, {'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): def get_images_detail(self, **kw):
@ -579,7 +579,7 @@ class FakeHTTPClient(base_client.HTTPClient):
}, },
{ {
"id": 744, "id": 744,
"name": "F16-x86_64-gold", "name": "F17-x86_64-gold",
"serverId": 9999, "serverId": 9999,
"updated": "2010-10-10T12:00:00Z", "updated": "2010-10-10T12:00:00Z",
"created": "2010-08-10T12:00:00Z", "created": "2010-08-10T12:00:00Z",

2
templates/MySQL_Single_Instance.template
View File

@ -59,7 +59,7 @@
"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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ],
"Default": "F16" "Default": "F17"
} }
}, },

2
templates/PuppetMaster_Single_Instance.template
View File

@ -26,7 +26,7 @@
"Type" : "String" "Type" : "String"
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_2_Instances.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_2_Instances_With_EBS.template
View File

@ -70,7 +70,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_2_Instances_With_EBS_EIP.template
View File

@ -70,7 +70,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_And_Http.template
View File

@ -58,7 +58,7 @@
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Composed_Instances.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_With_EBS.template
View File

@ -70,7 +70,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_With_EBS_EIP.template
View File

@ -70,7 +70,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_With_EIP.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_With_HA.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_With_IHA.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_Single_Instance_deb.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "Default": "F17",
"Description" : "Distribution of choice", "Description" : "Distribution of choice",
"Type": "String", "Type": "String",
"AllowedValues" : "U10" "AllowedValues" : "U10"

2
templates/WordPress_Single_Instance_gold.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_With_LB.template
View File

@ -61,7 +61,7 @@
"ConstraintDescription": "must contain only alphanumeric characters." "ConstraintDescription": "must contain only alphanumeric characters."
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]

2
templates/WordPress_With_RDS.template
View File

@ -79,7 +79,7 @@
}, },
"LinuxDistribution": { "LinuxDistribution": {
"Default": "F16", "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" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]