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

[Michael Hall]

Update to the latest AMIs, remove 'Beta' label.

Update to the *new* latest AMIs, remove 'Beta' label.

[Dustin Kirkland  (kirkland)]

On Wed, Oct 12, 2011 at 10:36 AM, Michael Hall <email address hidden> wrote:
> === modified file 'awstrial/settings.py'
> --- awstrial/settings.py        2011-10-11 15:22:07 +0000
> +++ awstrial/settings.py        2011-10-12 15:34:34 +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-ac7a00fe',
> +  'eu-west-1' : 'ami-73b18307',
> +  'us-east-1' : 'ami-d108c4b8',
> +  'us-west-1' : 'ami-07722e42',
>  }
>
>  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-9c7a00ce',
> +  'eu-west-1' : 'ami-dfb082ab',
> +  'us-east-1' : 'ami-a70ec2ce',
> +  'us-west-1' : 'ami-99712ddc',
>  }

I'm not nacking this, but consider for a moment Scott's utility
ubuntu-cloudimg-query which fetches AMI's from a
Canonical-controlled-and-published REST API. Otherwise, I fear that
you'll continue updating these unreadable strings ad nauseum.

Something to chew on ;-)

Thanks for taking over this awstrial work, btw. Hope you're enjoying
it as much as we did, when we were hacking on it not-so-long-ago!

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

259. By Michael Hall on 2011-10-12

Update AMIs to final release image

[Scott Moser (smoser)]

Looks good to me.
ap-southeast-1 ami-76057f24 ebs/ubuntu-oneiric-11.10-i386-server-20111011
eu-west-1 ami-65b28011 ebs/ubuntu-oneiric-11.10-i386-server-20111011
us-east-1 ami-a7f539ce ebs/ubuntu-oneiric-11.10-i386-server-20111011
us-west-1 ami-79772b3c ebs/ubuntu-oneiric-11.10-i386-server-20111011
ap-southeast-1 ami-82047ed0 ubuntu-oneiric-11.10-i386-server-20111011
eu-west-1 ami-dfcdffab ubuntu-oneiric-11.10-i386-server-20111011
us-east-1 ami-29f43840 ubuntu-oneiric-11.10-i386-server-20111011
us-west-1 ami-a7762ae2 ubuntu-oneiric-11.10-i386-server-20111011

[Matthew Nuzum (newz)]

Approve

review: Approve

=== modified file 'awstrial/settings.py'
--- awstrial/settings.py	2011-10-11 15:22:07 +0000
+++ awstrial/settings.py	2011-10-12 17:02:23 +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-76057f24',
+  'eu-west-1' : 'ami-65b28011',
+  'us-east-1' : 'ami-a7f539ce',
+  'us-west-1' : 'ami-79772b3c',
 }
 
 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-82047ed0',
+  'eu-west-1' : 'ami-dfcdffab',
+  'us-east-1' : 'ami-29f43840',
+  'us-west-1' : 'ami-a7762ae2',
 }
 
 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' },
 ]