From: marios <[email protected]> Fixes DTACLOUD_328
Signed-off-by: marios <[email protected]> --- server/lib/deltacloud/drivers/openstack/openstack_driver.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb index 04bd409..1c8ca02 100644 --- a/server/lib/deltacloud/drivers/openstack/openstack_driver.rb +++ b/server/lib/deltacloud/drivers/openstack/openstack_driver.rb @@ -190,11 +190,19 @@ module Deltacloud def destroy_instance(credentials, instance_id) os = new_client(credentials) + server = instance = nil safely do server = os.get_server(instance_id) server.delete! - convert_from_server(server, os.connection.authuser) end + begin + server.populate + instance = convert_from_server(server, os.connection.authuser) + rescue OpenStack::Exception::ItemNotFound + instance = convert_from_server(server, os.connection.authuser) + instance.state = "STOPPED" + end + instance end alias_method :stop_instance, :destroy_instance -- 1.7.11.7
