diff --git a/src/com/mirantis/mk/openstack.groovy b/src/com/mirantis/mk/openstack.groovy
index b87dd4f..06ff885 100644
--- a/src/com/mirantis/mk/openstack.groovy
+++ b/src/com/mirantis/mk/openstack.groovy
@@ -153,14 +153,16 @@
     output = python.parseTextTable(outputTable, 'item', 'prettytable', path)
 
     i = 1
+
     while (true) {
         status = getHeatStackStatus(client, name, path)
         echo("[Heat Stack] Status: ${status}, Check: ${i}")
-        if (status == 'CREATE_FAILED') {
+
+        if (status.indexOf('CREATE_FAILED') != -1) {
             info = getHeatStackInfo(client, name, path)
             throw new Exception(info.stack_status_reason)
         }
-        else if (status == 'CREATE_COMPLETE') {
+        else if (status.indexOf('CREATE_COMPLETE') != -1) {
             info = getHeatStackInfo(client, name, path)
             echo(info.stack_status_reason)
             break