From bda0520c8b5a1bde14c8f3f5323224abdc99810d Mon Sep 17 00:00:00 2001 From: Oleg Barenboim Date: Mon, 12 Sep 2016 08:29:51 -0400 Subject: [PATCH] Merge pull request #11177 from andyvesel/make_topology_visible_for_rhos_undercloud [WIP] Make topology visible for rhos undercloud (cherry picked from commit aea2f74703a377400180f2b799c457518424fe62) https://bugzilla.redhat.com/show_bug.cgi?id=1349420 --- .../providers/openstack/infra_manager/host.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/models/manageiq/providers/openstack/infra_manager/host.rb b/app/models/manageiq/providers/openstack/infra_manager/host.rb index 9135c7a9464..79b71227164 100644 --- a/app/models/manageiq/providers/openstack/infra_manager/host.rb +++ b/app/models/manageiq/providers/openstack/infra_manager/host.rb @@ -29,6 +29,18 @@ def cloud_tenants ::CloudTenant.where(:id => vms.collect(&:cloud_tenant_id).uniq) end + # TODO(aveselov) Added 3 empty methods here because 'entity' inside 'build_recursive_topology' calls for these methods. + # Work still in progress, but at least it makes a topology visible for rhos undercloud. + + def load_balancers + end + + def cloud_tenant + end + + def security_groups + end + def ssh_users_and_passwords user_auth_key, auth_key = auth_user_keypair user_password, password = auth_user_pwd