apply inactive settings when termination fails

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.7.1
+=====
+
+* apply inactive settings to not terminated black instance
+
 0.7.0
 =====
 

lib/eb_deployer/deployment_strategy/blue_green.rb

@@ -34,22 +34,11 @@ def deploy(version_label, env_settings, inactive_settings=[])
 
         if blue_green_terminate_inactive
           active_ebenv.log("Waiting #{blue_green_terminate_inactive_wait}s before terminating environment...")
+
+          sleep 120
 
-          # Loop until timeout reached or environment becomes Red
-          count = 0
-          loop do
-            break if count >= blue_green_terminate_inactive_wait or inactive_ebenv.health_state != 'Green'
-            sleep blue_green_terminate_inactive_sleep
-            count += blue_green_terminate_inactive_sleep
-          end
-
-          if inactive_ebenv.health_state == 'Green'
-            active_ebenv.log("Active environment healthy, terminating inactive (black) environment")
-            active_ebenv.terminate
-          else
-            active_ebenv.log("Active environment changed state to unhealthy. Existing (black) environment will not be terminated")
-          end
-
+          active_ebenv.log("terminating inactive (black) environment")
+          active_ebenv.terminate
         end
 
         unless inactive_settings.empty? || blue_green_terminate_inactive

lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end