openstack/tripleo-common
Code Issues Proposed changes

Merge "kolla_builder: use any templates except puppet"

Browse Source
This commit is contained in:
Zuul 2018-06-16 21:22:48 +00:00 committed by Gerrit Code Review
commit c61b84b487
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleo_common/image/kolla_builder.py
View File

@ -90,13 +90,9 @@ def build_service_filter(environment, roles_data):
# enabled services # enabled services
return enabled_services return enabled_services
# Use the template path to determine if it represents a
# containerized service
containerized_services_path = ['/docker/services/',
'/services/kubernetes',
'/services/openshift']
for service, env_path in environment.get('resource_registry', {}).items(): for service, env_path in environment.get('resource_registry', {}).items():
if any(p in env_path for p in containerized_services_path): if not any(p in env_path for p in ['/puppet/services',
'OS::Heat::None']):
containerized_services.add(service) containerized_services.add(service)
return containerized_services.intersection(enabled_services) return containerized_services.intersection(enabled_services)

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

@ -685,6 +685,7 @@ class TestPrepare(base.TestCase):
'OS::TripleO::Services::NovaCompute', 'OS::TripleO::Services::NovaCompute',
'OS::TripleO::Services::OpenShift::Master', 'OS::TripleO::Services::OpenShift::Master',
'OS::TripleO::Services::Kubernetes::Worker', 'OS::TripleO::Services::Kubernetes::Worker',
'OS::TripleO::Services::SkydiveAgent',
]), ]),
kb.build_service_filter({ kb.build_service_filter({
'resource_registry': { 'resource_registry': {
@ -697,7 +698,11 @@ class TestPrepare(base.TestCase):
'OS::TripleO::Services::OpenShift::Master': 'OS::TripleO::Services::OpenShift::Master':
'extraconfig/services/openshift-master.yaml', 'extraconfig/services/openshift-master.yaml',
'OS::TripleO::Services::Kubernetes::Worker': 'OS::TripleO::Services::Kubernetes::Worker':
'extraconfig/services/kubernetes-worker.yaml' 'extraconfig/services/kubernetes-worker.yaml',
'OS::TripleO::Services::SkydiveAgent':
'extraconfig/services/skydive-agent.yaml',
'OS::TripleO::Services::Noop':
'OS::Heat::None'
} }
}, [ }, [
{ {
@ -706,7 +711,9 @@ class TestPrepare(base.TestCase):
'ServicesDefault': [ 'ServicesDefault': [
'OS::TripleO::Services::NeutronApi', 'OS::TripleO::Services::NeutronApi',
'OS::TripleO::Services::NovaApi', 'OS::TripleO::Services::NovaApi',
'OS::TripleO::Services::OpenShift::Master' 'OS::TripleO::Services::OpenShift::Master',
'OS::TripleO::Services::SkydiveAgent',
'OS::TripleO::Services::Noop'
] ]
}, { }, {
'name': 'Compute', 'name': 'Compute',