diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index caf9c1d0bf..ad00773a1b 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -285,7 +285,6 @@ post '/service/:id/role/:role_name/action' do rc = nil service = service_pool.get(params[:id]) { |service| - # TODO check service state roles = service.get_roles role = roles[params[:role_name]] diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index fb944a8980..8bca59e718 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -308,11 +308,6 @@ protected vm_state = node['vm_info']['VM']['STATE'] if vm_state == '7' # FAILED - - # TODO: return error message and log it into the service log - #msg = "Role #{role.name()} : VM #{node['deploy_id']} found in FAILED state" - #Log.error LOG_COMP, msg - return true end end @@ -349,10 +344,6 @@ protected (node['disposed'] == '1' || node['scale_up'] == '1') && node['vm_info']['VM']['STATE'] == '7' # FAILED - # TODO: return error message and log it into the service log - #msg = "Role #{role.name()} : VM #{node['deploy_id']} found in FAILED state" - #Log.error LOG_COMP, msg - return true end } diff --git a/flow/models/Role.rb b/flow/models/Role.rb index de5f878ca8..861e54717f 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -435,7 +435,6 @@ module OpenNebula end tmp_str = vm.user_template_str - # TODO time & periods if do_offset time_offset = (index / vms_per_period.to_i).floor * period.to_i