diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index 494c46bea6..bfa1de39f8 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -137,15 +137,13 @@ class Strategy case role.state() when Role::STATE['RUNNING'] - if OpenNebula.is_error?(rc) - role.set_state(Role::STATE['WARNING']) - elsif role_nodes_warning?(role) + if OpenNebula.is_error?(rc) || role_nodes_warning?(role) role.set_state(Role::STATE['WARNING']) end role.update_cardinality() when Role::STATE['WARNING'] - if !role_nodes_warning?(role) + if !OpenNebula.is_error?(rc) && !role_nodes_warning?(role) role.set_state(Role::STATE['RUNNING']) end diff --git a/flow/models/Role.rb b/flow/models/Role.rb index c87f75bc3e..7da7d9121c 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -222,7 +222,11 @@ module OpenNebula @body['nodes'] = new_nodes - return success + if !success + return OpenNebula::Error.new() + end + + return nil end # Deploys all the nodes in this role