diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb index bb60c02..1d5e187 100644 --- a/devops-service/providers/ec2.rb +++ b/devops-service/providers/ec2.rb @@ -210,7 +210,6 @@ module Provider out << "Stack name: #{stack.name}\n" out << "Stack template: #{stack.stack_template}\n" out << "Stack parameters: #{stack.parameters}\n" - out << "Stack template: #{stack.template_body}\n" out.flush response = cloud_formation.create_stack(stack.name, { @@ -256,9 +255,9 @@ module Provider end def stack_servers(stack) - r = stack_resources(stack) + r = list_stack_resources({'StackName' => stack.name}).body['StackResourceSummaries'] #stack_resources(stack) pp r - s = r.map{|r| pp r; compute.servers.get(r['physical_resource_id'])} + s = r.map{|r| pp r; compute.servers.get(r['PhysicalResourceId'])} pp s s end diff --git a/devops-service/providers/openstack.rb b/devops-service/providers/openstack.rb index ed34fcc..f4119e8 100644 --- a/devops-service/providers/openstack.rb +++ b/devops-service/providers/openstack.rb @@ -199,7 +199,6 @@ module Provider out << "Stack name: #{stack.name}\n" out << "Stack template: #{stack.stack_template}\n" out << "Stack parameters: #{stack.parameters}\n" - out << "Stack template: #{stack.template_body}\n" out.flush response = orchestration.create_stack( stack_name: stack.name, @@ -208,6 +207,7 @@ module Provider ) stack.id = response[:body]['stack']['id'] out << "Stack id: #{stack.id}\n" + out.flush rescue Excon::Errors::Conflict => e raise ProviderErrors::NameConflict rescue Excon::Errors::BadRequest => br