From 0ec8b8e2dffc4686931f7ee8b62e527790a458d0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 10 Jan 2019 14:43:04 +0000 Subject: [PATCH] Restrict inventory test to devstack-admin There are multiple different cloud entries in clouds.yaml now. That means that doing an inventory across all configured clouds gets weird, especially when we're tossing system scoped accounts in there. Cherry-picked from https://review.openstack.org/622373/ Change-Id: I0530ca35da0cc3baebab2c3bc53eea70028ceed5 --- shade/tests/functional/test_inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shade/tests/functional/test_inventory.py b/shade/tests/functional/test_inventory.py index ce98625cf..3f29847eb 100644 --- a/shade/tests/functional/test_inventory.py +++ b/shade/tests/functional/test_inventory.py @@ -30,7 +30,7 @@ class TestInventory(base.BaseFunctionalTestCase): super(TestInventory, self).setUp() # This needs to use an admin account, otherwise a public IP # is not allocated from devstack. - self.inventory = inventory.OpenStackInventory() + self.inventory = inventory.OpenStackInventory(cloud='devstack-admin') self.server_name = self.getUniqueString('inventory') self.flavor = pick_flavor( self.user_cloud.list_flavors(get_extra=False))