diff --git a/src/ozones/Server/lib/OZones/VDC.rb b/src/ozones/Server/lib/OZones/VDC.rb index 19587c5605..2026429ac4 100644 --- a/src/ozones/Server/lib/OZones/VDC.rb +++ b/src/ozones/Server/lib/OZones/VDC.rb @@ -338,9 +338,6 @@ module OZones return if rsrc[:ACLS].nil? - OzonesServer::logger.debug { - "Deleting VDC ACL rules: #{rsrc[:ACLS][first..-1]}" } - rsrc[:ACLS][first..-1].each { |acl_id| OpenNebula::Acl.new_with_id(acl_id, @client).delete } diff --git a/src/ozones/Server/models/OzonesServer.rb b/src/ozones/Server/models/OzonesServer.rb index f9d83e9b86..2777fe6532 100644 --- a/src/ozones/Server/models/OzonesServer.rb +++ b/src/ozones/Server/models/OzonesServer.rb @@ -192,13 +192,13 @@ class OzonesServer < CloudServer vdc_data[:CLUSTER_ID] = vdc.vdc.CLUSTER_ID vdc_data[:ID] = vdc.vdc.ID - force = vdc_data.delete(:FORCE) + force = vdc_data.delete(:FORCE) if (!force or force.upcase!="YES") and !host_unique?(vdc.zone, vdc_data) return [403, OZones::Error.new("Error: Couldn't update vdc. " \ "Hosts are not unique, use force to override").to_json] end - logger.debug {"----> #{vdc_data}"} + rc = vdc.update(vdc_data[:RESOURCES]) if !OpenNebula.is_error?(rc)