Change templates to launch F17 (not F16) by default
Change-Id: If8b97e85f2dca5251145a8eebb184e43e25a34ea Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
parent
0ad5ab9748
commit
e1c0b4eafc
@ -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'},
|
||||
|
@ -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')
|
||||
|
||||
|
@ -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",
|
||||
|
@ -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"
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -61,7 +61,7 @@
|
||||
"ConstraintDescription" : "must contain only alphanumeric characters."
|
||||
},
|
||||
"LinuxDistribution": {
|
||||
"Default": "F16",
|
||||
"Default": "F17",
|
||||
"Description" : "Distribution of choice",
|
||||
"Type": "String",
|
||||
"AllowedValues" : "U10"
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
@ -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" ]
|
||||
|
Loading…
Reference in New Issue
Block a user