Skip to content

Commit

Permalink
Merge pull request #14161 from Ladas/placeholder_availability_zones_f…
Browse files Browse the repository at this point in the history
…or_openstack_infra

We need a placeholder availability_zones method for network topology
(cherry picked from commit 8f004a3)

https://bugzilla.redhat.com/show_bug.cgi?id=1431163
  • Loading branch information
blomquisg authored and simaishi committed Mar 10, 2017
1 parent 654aef8 commit 3262f40
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions app/models/manageiq/providers/openstack/infra_manager.rb
Expand Up @@ -25,12 +25,11 @@ def ensure_network_manager
build_network_manager(:type => 'ManageIQ::Providers::Openstack::NetworkManager') unless network_manager
end

def cloud_tenants
CloudTenant.where(:ems_id => provider.try(:cloud_ems).try(:collect, &:id).try(:uniq))
# A placeholder relation for NetworkTopology to work
def availability_zones
end

def availability_zones
AvailabilityZone.where(:ems_id => provider.try(:cloud_ems).try(:collect, &:id).try(:uniq))
def cloud_tenants
end

def host_aggregates
Expand Down

0 comments on commit 3262f40

Please sign in to comment.