From eabfedc378764faf29399c623bc9875aaf0aea23 Mon Sep 17 00:00:00 2001
From: Anton Chuchkalov <anton.chuchkalov@novartis.com>
Date: Fri, 22 Apr 2016 12:18:45 +0300
Subject: [PATCH] CID-512: add informative message in case of rollback

---
 devops-service/workers/stack_bootstrap_worker.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb
index 48aa105..aac12cc 100644
--- a/devops-service/workers/stack_bootstrap_worker.rb
+++ b/devops-service/workers/stack_bootstrap_worker.rb
@@ -45,8 +45,13 @@ class StackBootstrapWorker < Worker
   def bootstrap_or_rollback_if_failed(options)
     bootstrap_result = executor.bootstrap_just_persisted(jid)
     puts_and_flush Devops::Messages.t("worker.stack_bootstrap.bootstrap_result.#{bootstrap_result.reason}")
-    if bootstrap_result.bootstrap_error? && !options[:skip_rollback]
-      rollback_stack!
+    # 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."
+      else
+        rollback_stack!
+      end
     end
     bootstrap_result.code
   end