fix error that broke stack status updating
This commit is contained in:
parent
b22045a278
commit
4a44f6baa0
@ -12,6 +12,10 @@ module Devops
|
|||||||
@@applications
|
@@applications
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.root
|
||||||
|
File.expand_path(File.dirname(__FILE__) + '/..')
|
||||||
|
end
|
||||||
|
|
||||||
def prepare
|
def prepare
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@ -15,9 +15,9 @@ require "hooks"
|
|||||||
=end
|
=end
|
||||||
|
|
||||||
require_relative "devops-loader"
|
require_relative "devops-loader"
|
||||||
|
require_relative "devops-application"
|
||||||
require_relative "devops-db"
|
require_relative "devops-db"
|
||||||
require_relative "devops-logger"
|
require_relative "devops-logger"
|
||||||
require_relative "devops-application"
|
|
||||||
|
|
||||||
require "lib/knife/knife_factory"
|
require "lib/knife/knife_factory"
|
||||||
|
|
||||||
|
|||||||
@ -40,7 +40,8 @@ module Devops
|
|||||||
stack_template: stack_template,
|
stack_template: stack_template,
|
||||||
name: name,
|
name: name,
|
||||||
parameters: parameters,
|
parameters: parameters,
|
||||||
# details: details,
|
# details are required to proper status handling
|
||||||
|
details: details,
|
||||||
stack_status: stack_status,
|
stack_status: stack_status,
|
||||||
owner: owner
|
owner: owner
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,8 +2,12 @@ require "mongo"
|
|||||||
require "forwardable"
|
require "forwardable"
|
||||||
|
|
||||||
require "db/mongo/connectors/base"
|
require "db/mongo/connectors/base"
|
||||||
Dir["db/mongo/connectors/helpers/*.rb"].each {|file| require file }
|
|
||||||
Dir["db/mongo/connectors/*.rb"].each {|file| require file }
|
helpers_files = File.join(Devops::Application.root, "db/mongo/connectors/helpers/*.rb")
|
||||||
|
Dir[helpers_files].each {|file| require file }
|
||||||
|
|
||||||
|
connectors_files = File.join(Devops::Application.root, "db/mongo/connectors/*.rb")
|
||||||
|
Dir[connectors_files].each {|file| require file }
|
||||||
|
|
||||||
include Mongo
|
include Mongo
|
||||||
|
|
||||||
|
|||||||
@ -230,7 +230,11 @@ module Provider
|
|||||||
end
|
end
|
||||||
|
|
||||||
def delete_stack(stack)
|
def delete_stack(stack)
|
||||||
orchestration.delete_stack(Fog::Orchestration::OpenStack::Stack.new({'id' => stack.id, 'stack_name' => stack.name}))
|
begin
|
||||||
|
orchestration.delete_stack(Fog::Orchestration::OpenStack::Stack.new({'id' => stack.id, 'stack_name' => stack.name}))
|
||||||
|
rescue Fog::Compute::OpenStack::NotFound
|
||||||
|
puts 'already deleted'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def stack_details(stack)
|
def stack_details(stack)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user