From db67d3d5e88c27ae6e83db97b6813598941b7004 Mon Sep 17 00:00:00 2001 From: Dhruv Bansal Date: Fri, 20 Sep 2013 04:06:18 -0500 Subject: [PATCH] vcd client no longer returns nil on 404 --- lib/wukong-deploy/deploy_pack.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/wukong-deploy/deploy_pack.rb b/lib/wukong-deploy/deploy_pack.rb index 8910f95..3e6f3b7 100644 --- a/lib/wukong-deploy/deploy_pack.rb +++ b/lib/wukong-deploy/deploy_pack.rb @@ -190,13 +190,7 @@ def self.read_remote_settings end topic = "deploy_packs.#{name}" remote_settings = vayacondios_client.get(topic) - if remote_settings - if remote_settings.is_a?(Hash) - settings.merge(remote_settings) - else - Wukong::Log.warn("Remote settings for <#{topic}> must be a Hash. Got: #{remote_settings}") - end - end + settings.merge(remote_settings) if remote_settings.success? end end