Merge lp:~mhall119/awstrial/oneiric-ami-update into lp:awstrial

[Michael Hall]

Update to the latest daily AMIs, which will hopefully also be the final release AMIs

[Matthew Nuzum (newz)]

approved, looks good.

review: Approve

[lp:~mhall119/awstrial/oneiric-ami-update]

256. By Michael Hall on 2011-10-11

Update to the latest daily AMIs, remove the 'Beta' label from the drop down list.

=== modified file 'awstrial/settings.py'
--- awstrial/settings.py	2011-10-07 14:14:41 +0000
+++ awstrial/settings.py	2011-10-11 14:31:25 +0000
@@ -134,17 +134,17 @@
 ALTERNATE_CLOUD = False
 default_ami_ids = { }
 default_ami_ids['ebs'] = {
-  'ap-southeast-1' : 'ami-dcd8a38e',
-  'eu-west-1' : 'ami-5a6c5e2e',
-  'us-east-1' : 'ami-fb34f692',
-  'us-west-1' : 'ami-611f4324',
+  'ap-southeast-1' : 'ami-12007a40',
+  'eu-west-1' : 'ami-edc4f699',
+  'us-east-1' : 'ami-53ec203a',
+  'us-west-1' : 'ami-37782472',
 }
 
 default_ami_ids['instance'] = {
-  'ap-southeast-1' : 'ami-0ad8a358',
-  'eu-west-1' : 'ami-a46f5dd0',
-  'us-east-1' : 'ami-6f34f606',
-  'us-west-1' : 'ami-b11e42f4',
+  'ap-southeast-1' : 'ami-48007a1a',
+  'eu-west-1' : 'ami-39c4f64d',
+  'us-east-1' : 'ami-e3d31f8a',
+  'us-west-1' : 'ami-7b78243e',
 }
 
 REGION2AMI=default_ami_ids['instance']
@@ -169,13 +169,13 @@
 BASE_URL = "http://example.com"
 
 CONFIGS = [
-    { 'name': 'default', 'description': 'Ubuntu Server (11.10 Beta) Base Install',
+    { 'name': 'default', 'description': 'Ubuntu Server (11.10) Base Install',
       'template': None, 'info_tmpl': 'cc-base-info' },
-    { 'name': 'wordpress', 'description': 'Ubuntu Server (11.10 Beta) with WordPress',
+    { 'name': 'wordpress', 'description': 'Ubuntu Server (11.10) with WordPress',
       'template': 'cc-wordpress', 'info_tmpl': 'cc-wordpress-info' },
-    { 'name': 'moinmoin', 'description': 'Ubuntu Server (11.10 Beta) with MoinMoin Wiki',
+    { 'name': 'moinmoin', 'description': 'Ubuntu Server (11.10) with MoinMoin Wiki',
        'template': 'cc-moinmoin', 'info_tmpl': 'cc-moinmoin-info' },
-    { 'name': 'drupal', 'description': 'Ubuntu Server (11.10 Beta) with Drupal 7',
+    { 'name': 'drupal', 'description': 'Ubuntu Server (11.10) with Drupal 7',
        'template': 'cc-drupal', 'info_tmpl': 'cc-drupal-info' },
 ]