From a7eec9b1e9025887ce388ebb966a1c2c03fbd29e Mon Sep 17 00:00:00 2001 From: jordangbull Date: Thu, 11 Jul 2013 18:40:40 -0700 Subject: [PATCH] Fixed server bootstrap to remove default image if a boot disk is specified --- lib/fog/google/compute.rb | 2 +- lib/fog/google/models/compute/servers.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/fog/google/compute.rb b/lib/fog/google/compute.rb index a2b60acc1..70ab252b9 100644 --- a/lib/fog/google/compute.rb +++ b/lib/fog/google/compute.rb @@ -138,7 +138,7 @@ module Fog end def backoff_if_unfound(&block) - retries_remaining = 5 + retries_remaining = 10 begin result = block.call rescue Exception => msg diff --git a/lib/fog/google/models/compute/servers.rb b/lib/fog/google/models/compute/servers.rb index 83700137f..df645a732 100644 --- a/lib/fog/google/models/compute/servers.rb +++ b/lib/fog/google/models/compute/servers.rb @@ -51,6 +51,11 @@ module Fog :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"), :username => ENV['USER'], } + if new_attributes[:disks] + new_attributes[:disks].each do |disk| + defaults.delete :image_name if disk['boot'] + end + end server = create(defaults.merge(new_attributes)) server.wait_for { sshable? }