X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FOyster.git;a=blobdiff_plain;f=lib%2FOyster%2FProvision%2FAmazonEC2.pm;h=565e1ec20dcbf375e3ee4340687508b920b5af93;hp=8fdd7afbbfa6ad91881274cb4018a6788220cd58;hb=3f4fb5441a2522643af82bdad982603447231fe1;hpb=8a0402ec798af800cd25fe0d26fd1e5ef1d0fef0

diff --git a/lib/Oyster/Provision/AmazonEC2.pm b/lib/Oyster/Provision/AmazonEC2.pm
index 8fdd7af..565e1ec 100644
--- a/lib/Oyster/Provision/AmazonEC2.pm
+++ b/lib/Oyster/Provision/AmazonEC2.pm
@@ -1,16 +1,15 @@
 package Oyster::Provision::AmazonEC2;
+use Carp;
 use Moose::Role;
 use Net::Amazon::EC2;
 
 requires 'config';
 
 has 'api_username' => ( is => 'ro', isa => 'Str', required => 1, default => sub {
-    return "AKIAJXSD25MPWFYTQWIQ";
-    confess "Need api_username";
+    die "Need api_username";
 });
 has 'api_password' => ( is => 'ro', isa => 'Str', required => 1, default => sub {
-    return "m76s9DyoXrHdpVy8HkhjgD0RAjy14bhkQ5Zts/gg";
-    confess "Need api_password";
+    die "Need api_password";
 });
 
 has ec2_oyster_key => (is => 'rw', isa => 'Str', default => "OysterDefault");
@@ -27,7 +26,7 @@ sub ec2 {
     
     unless(defined($key_pairs)) {
     
-        print("Creating $ec2_oyster_key key pair\n");
+        print("Creating $self->ec2_oyster_key key pair\n");
         $ec2->create_key_pair({ KeyName => $self->ec2_oyster_key });
     
     }
@@ -41,8 +40,8 @@ sub create {
    $self->config(); 
 
    # Start 1 new instance from AMI: ami-XXXXXXXX
-   my $instance = $ec2->run_instances(
-       ImageId  => $self->image() or "ami-1a837773",
+   my $instance = $self->ec2->run_instances(
+       ImageId  => $self->image() or "ami-be6e99d7",
        KeyName  => $self->ec2_oyster_key,
        MinCount => 1,
        MaxCount => 1,
@@ -72,7 +71,7 @@ Oyster::Provision::AmazonEC2 -- Provision your Oyster on Amazon EC2
 
 =head1 SYNOPSIS
 
-Use the Rackspace backend on your Oyster configuration file
+Use the Amazon backend on your Oyster configuration file
 
 =head1 REQUIRED PARAMETERS