From d3af55acacf616594e2cdb3a9c6b33777bb0a87d Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Thu, 14 Apr 2016 23:00:39 +0300 Subject: [PATCH] do not delete servers if skip_rollback is set --- devops-service/app/api2/parsers/stack.rb | 4 ++-- devops-service/lib/executors/server_executor.rb | 12 ++++++++---- devops-service/lib/sync_stack_lambda.py | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/devops-service/app/api2/parsers/stack.rb b/devops-service/app/api2/parsers/stack.rb index 5be3b6e..24d19df 100644 --- a/devops-service/app/api2/parsers/stack.rb +++ b/devops-service/app/api2/parsers/stack.rb @@ -12,8 +12,8 @@ module Devops unless @body['stack_attributes'] @body = { 'stack_attributes' => @body.dup, - 'without_bootstrap' => false, - 'skip_rollback' => false + 'without_bootstrap' => true, + 'skip_rollback' => true } end diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index 00e1ce4..20b0523 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -239,15 +239,19 @@ module Devops else @out.puts "Can not find client or node on chef-server" @out.puts "Skip rollback because :skip_rollback option is set" - roll_back unless options[:skip_rollback] + unless options[:skip_rollback] + roll_back + mongo.server_delete @server.id + end @out.flush - mongo.server_delete @server.id return error_code(:server_not_in_chef_nodes) end else @out.puts "Skip rollback because :skip_rollback option is set" - roll_back unless options[:skip_rollback] - mongo.server_delete @server.id + unless options[:skip_rollback] + roll_back + mongo.server_delete @server.id + end msg = "Failed while bootstraping server with id '#{@server.id}'\n" msg << "Bootstraping operation result was #{bootstrap_status}" DevopsLogger.logger.error msg diff --git a/devops-service/lib/sync_stack_lambda.py b/devops-service/lib/sync_stack_lambda.py index 9269d46..2d460c4 100644 --- a/devops-service/lib/sync_stack_lambda.py +++ b/devops-service/lib/sync_stack_lambda.py @@ -8,9 +8,11 @@ import urllib2 def lambda_handler(event, context): print("Received event: " + json.dumps(event, indent=2)) - host = 'http://CHANGE_ME' + host = 'http://10.147.138.125:5080/services/cid' group_name = event['detail']['AutoScalingGroupName'] - url = '%s/v2.0/provider_notifications/aws/first/autoscaling_groups/%s/changes' % (host, group_name) + print(group_name) + url = '%s/v2.0/provider_notifications/aws/689977946780/autoscaling_groups/%s/changes' % (host, group_name) + username = 'CHANGE_ME' password = 'CHANGE_ME' @@ -19,4 +21,4 @@ def lambda_handler(event, context): request.add_header('Authorization', 'Basic %s' % base64string) request.add_header('Content-Type', 'application/json') - urllib2.urlopen(request) \ No newline at end of file + urllib2.urlopen(request)