Permalink
Browse files

better error messages if we don't have everything needed to launch a …

…cluster
  • Loading branch information...
1 parent 03fab60 commit 812952d9de66db0f534c1be4d4f6d3fd2387e39b Philip (flip) Kromer committed Dec 22, 2011
Showing with 2 additions and 5 deletions.
  1. +0 −3 lib/cluster_chef/chef_layer.rb
  2. +2 −2 lib/cluster_chef/cloud.rb
@@ -108,9 +108,6 @@ def delete_chef
# creates or updates the chef node.
#
- # FIXME: !! this currently doesn't do the right thing for modifications to the
- # chef node. !!
- #
# See notes at top of file for why all this jiggery-fuckery
#
# * client exists, node exists: assume client can update, weep later when
@@ -206,7 +206,7 @@ def mount_ephemerals(attrs={})
# Utility methods
def image_info
- Chef::Config[:ec2_image_info][ [region, bits, backing, image_name] ] or ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name].inspect})"
+ Chef::Config[:ec2_image_info][ [region, bits, backing, image_name] ] or ( ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name].inspect})" ; {} )
end
def list_images
@@ -225,7 +225,7 @@ def flavor(val=nil)
end
def flavor_info
- FLAVOR_INFO[flavor] or raise "Please define the machine's flavor: have #{self.inspect}"
+ FLAVOR_INFO[flavor] or ( ui.warn "Please define the machine's flavor: have #{self.inspect}" ; {} )
end
def list_flavors

0 comments on commit 812952d

Please sign in to comment.