Merge "Fix check_service_vips_migrated_to_service()"

This commit is contained in:
Zuul 2021-06-02 18:31:44 +00:00 committed by Gerrit Code Review
commit fe22d67515
1 changed files with 2 additions and 1 deletions

View File

@ -1177,7 +1177,8 @@ def check_service_vips_migrated_to_service(stack, environment):
"'ServiceNetMap' and/or 'VipSubnetMap' parameters with the desired "
"network and/or subnet for the service.")
for resource in removed_resources:
if resource in registry or resource in stack_registry:
if ((resource in registry or resource in stack_registry) and
registry.get(resource) != 'OS::Heat::None'):
raise exceptions.InvalidConfiguration(msg)