openstack/tripleo-common
Code Issues Proposed changes

Merge "Whitelist k8s and OpenShift services as containerized"

Browse Source
This commit is contained in:
Zuul
2018-06-11 08:21:59 +00:00
committed by Gerrit Code Review
parent c35a4289d7 345c4fe549
commit bb33c41e59
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tripleo_common/image/kolla_builder.py
View File

@@ -90,10 +90,13 @@ def build_service_filter(environment, roles_data):
# 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():
# Use the template path to determine if it represents a
# containerized service
if '/docker/services/' in env_path:
if any(p in env_path for p in containerized_services_path):
containerized_services.add(service)
return containerized_services.intersection(enabled_services)

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

@@ -682,7 +682,9 @@ class TestPrepare(base.TestCase):
self.assertEqual(
set([
'OS::TripleO::Services::NovaApi',
'OS::TripleO::Services::NovaCompute'
'OS::TripleO::Services::NovaCompute',
'OS::TripleO::Services::OpenShift::Master',
'OS::TripleO::Services::Kubernetes::Worker',
]),
kb.build_service_filter({
'resource_registry': {
@@ -692,6 +694,10 @@ class TestPrepare(base.TestCase):
'/tht/docker/services/foo.yaml',
'OS::TripleO::Services::NovaCompute':
'/tht/docker/services/foo.yaml',
'OS::TripleO::Services::OpenShift::Master':
'extraconfig/services/openshift-master.yaml',
'OS::TripleO::Services::Kubernetes::Worker':
'extraconfig/services/kubernetes-worker.yaml'
}
}, [
{
@@ -699,13 +705,15 @@ class TestPrepare(base.TestCase):
'CountDefault': 1,
'ServicesDefault': [
'OS::TripleO::Services::NeutronApi',
'OS::TripleO::Services::NovaApi'
'OS::TripleO::Services::NovaApi',
'OS::TripleO::Services::OpenShift::Master'
]
}, {
'name': 'Compute',
'CountDefault': 1,
'ServicesDefault': [
'OS::TripleO::Services::NovaCompute'
'OS::TripleO::Services::NovaCompute',
'OS::TripleO::Services::Kubernetes::Worker'
]
}, {
'name': 'BlockStorage',