From b8ce545f66be05ae62ddccd4ca92aacbeef7562a Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Wed, 2 Jun 2010 08:23:12 -0700
Subject: [PATCH] [bbg] create_block should raise errors on failure

---
 lib/fog/bluebox/models/server.rb         | 1 -
 lib/fog/bluebox/parsers/create_block.rb  | 3 ---
 lib/fog/bluebox/requests/create_block.rb | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/fog/bluebox/models/server.rb b/lib/fog/bluebox/models/server.rb
index 1011f9555..cf566a316 100644
--- a/lib/fog/bluebox/models/server.rb
+++ b/lib/fog/bluebox/models/server.rb
@@ -38,7 +38,6 @@ module Fog
       end
 
       def ready?
-        raise Fog::Bluebox::BlockInstantiationError, "Error creating block #{self.id}" if @status == 'error'
         @status == 'running'
       end
 
diff --git a/lib/fog/bluebox/parsers/create_block.rb b/lib/fog/bluebox/parsers/create_block.rb
index ffad16ca7..014333ef5 100644
--- a/lib/fog/bluebox/parsers/create_block.rb
+++ b/lib/fog/bluebox/parsers/create_block.rb
@@ -29,9 +29,6 @@ module Fog
             @response['image_id'] = @value
           when 'product'
             @scope = nil
-          when 'error' # An error occurred
-            @response['status'] = 'error'
-            @response[name] = @value
           end
         end
 
diff --git a/lib/fog/bluebox/requests/create_block.rb b/lib/fog/bluebox/requests/create_block.rb
index 464346961..5fe560c1c 100644
--- a/lib/fog/bluebox/requests/create_block.rb
+++ b/lib/fog/bluebox/requests/create_block.rb
@@ -30,7 +30,7 @@ DATA
 
         request(
           :body     => data,
-          :expects  => [200, 409],
+          :expects  => 200,
           :method   => 'POST',
           :parser   => Fog::Parsers::Bluebox::CreateBlock.new,
           :path     => '/api/blocks.xml'