openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Remove check for ./puppet/services when filtering services" into stable/train

This commit is contained in:
Zuul 2020-08-28 14:44:28 +00:00 committed by Gerrit Code Review
parent fe73336572 5446279919
commit cf1019492e
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleo_common/image/kolla_builder.py
View File

@ -106,18 +106,11 @@ def build_service_filter(environment, roles_data):
return None
enabled_services = get_enabled_services(environment, roles_data)
resource_registry = environment.get('resource_registry')
if not resource_registry:
# no way to tell which services are non-containerized, so
# filter by enabled services
return enabled_services
for service, env_path in environment.get('resource_registry', {}).items():
if service not in enabled_services:
continue
if env_path == 'OS::Heat::None':
enabled_services.remove(service)
if '/puppet/services' in env_path:
enabled_services.remove(service)
if resource_registry:
for service in enabled_services.copy():
env_path = resource_registry.get(service)
if env_path == 'OS::Heat::None':
enabled_services.remove(service)
return enabled_services

3
tripleo_common/tests/image/test_kolla_builder.py
View File

@ -957,13 +957,12 @@ class TestPrepare(base.TestCase):
'OS::TripleO::Services::HeatApi',
'OS::TripleO::Services::NovaApi',
'OS::TripleO::Services::NovaCompute',
'OS::TripleO::Services::NeutronApi',
'OS::TripleO::Services::Kubernetes::Worker',
'OS::TripleO::Services::SkydiveAgent',
]),
kb.build_service_filter({
'resource_registry': {
'OS::TripleO::Services::NeutronApi':
'/tht/puppet/services/foo.yaml',
'OS::TripleO::Services::NovaApi':
'/tht/docker/services/foo.yaml',
'OS::TripleO::Services::NovaCompute':