Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

save_vms_inventory needs to respect disconnect flag #15924

Merged
merged 1 commit into from
Sep 5, 2017
Merged

save_vms_inventory needs to respect disconnect flag #15924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/ems_refresh/save_inventory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def save_vms_inventory(ems, hashes, target = nil, disconnect = true)
target = ems if target.nil? && disconnect
log_header = "EMS: [#{ems.name}], id: [#{ems.id}]"

disconnects = if target.kind_of?(ExtManagementSystem) || target.kind_of?(Host)
disconnects = if disconnect && (target.kind_of?(ExtManagementSystem) || target.kind_of?(Host))
target.vms_and_templates.reload.to_a
elsif target.kind_of?(Vm)
elsif disconnect && target.kind_of?(Vm)
[target.ruby_clone]
else
[]
Expand Down