Feature #3175: Better sg/post call that can handle exceptions.

This commit is contained in:
Jaime Melis committed 2014-11-03 18:52:43 +01:00
1 parent 711528e6aa
commit eb9e4a5c42
3 files changed
+20 -4

No files matched your search

+1 -2
View File
@@ -23,5 +23,4 @@ require 'OpenNebulaNetwork'
require 'SecurityGroups'
sg = OpenNebulaSG.from_base64(ARGV[0])
exit sg.deactivate
sg.deactivate
+18 -1
View File
@@ -26,4 +26,21 @@ template64 = ARGV[0]
deploy_id = ARGV[1]
sg = OpenNebulaSG.from_base64(template64, deploy_id)
exit sg.activate
begin
sg.activate
rescue OpenNebulaSGError => e
OpenNebula.log_error(e.error.message)
case e.stage
when :bootstrap, :security_groups
OpenNebula.log_info("Deactivating security groups for #{deploy_id}.")
sg.deactivate
when :deactivate
OpenNebula.log_error("Error deactivating security group rules for #{deploy_id}. Please verify manually.")
end
exit 1
rescue Exception => e
OpenNebula.log_error(e.message)
exit 1
end
+1 -1
View File
@@ -16,4 +16,4 @@
# limitations under the License. #
#--------------------------------------------------------------------------- #
exit 0
exit 0