From e58e8c301831ab44cf14318a7059fae4fb3da260 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 22 Apr 2016 15:43:59 +0300 Subject: [PATCH] CID-512: add unknown error to bootstrap errors --- .../lib/executors/server_executor/server_operation_result.rb | 2 +- devops-service/workers/stack_bootstrap_worker.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops-service/lib/executors/server_executor/server_operation_result.rb b/devops-service/lib/executors/server_executor/server_operation_result.rb index 5c015f1..b410780 100644 --- a/devops-service/lib/executors/server_executor/server_operation_result.rb +++ b/devops-service/lib/executors/server_executor/server_operation_result.rb @@ -17,7 +17,7 @@ module Devops ) def one_of_bootstrap_errors? - [:server_bootstrap_fail, :server_not_in_chef_nodes, :server_bootstrap_unknown_error].include?(reason) + [:server_bootstrap_fail, :server_not_in_chef_nodes, :server_bootstrap_unknown_error, :unknown_error].include?(reason) end end diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb index aac12cc..59d1f55 100644 --- a/devops-service/workers/stack_bootstrap_worker.rb +++ b/devops-service/workers/stack_bootstrap_worker.rb @@ -48,7 +48,7 @@ class StackBootstrapWorker < Worker # move try_rollback to stack executor if bootstrap_result.bootstrap_error? if options[:skip_rollback] - puts_and_flush "\nSkip rollback because of skip_rollback option set to true." + puts_and_flush "\nSkip rollback because skip_rollback option set to true." else rollback_stack! end