From bda7320d6e28103cecfa1bed8d727c08ee208210 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 27 Mar 2019 14:47:46 +0000 Subject: [PATCH] Ignore COMPUTE_NET_ATTACH_INTERFACE trait when waiting for placement As of Stein, nova adds a 'COMPUTE_NET_ATTACH_INTERFACE' trait to ironic resource providers in placement. This means that they no longer match our expected set of traits. This patch removes this trait from the list of expected traits. Change-Id: I84bf367d31b10144617c0d66cc21dbcb5b0908a8 Story: 2005309 Task: 30210 --- ansible/roles/wait-for-resources/library/wait_for_resources.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/roles/wait-for-resources/library/wait_for_resources.py b/ansible/roles/wait-for-resources/library/wait_for_resources.py index aab4967..5f86fcf 100644 --- a/ansible/roles/wait-for-resources/library/wait_for_resources.py +++ b/ansible/roles/wait-for-resources/library/wait_for_resources.py @@ -239,9 +239,12 @@ def are_resources_available(module, specifiers, expected): """ providers_raw = get_providers(module) providers = [] + nova_internal_traits = {'COMPUTE_NET_ATTACH_INTERFACE'} for provider in providers_raw: uuid = provider["uuid"] traits = get_traits(module, uuid) + # Don't include traits assigned by the nova compute driver. + traits = traits - nova_internal_traits inventory = get_inventory(module, uuid) provider = Provider( uuid=uuid,