openstack
/
kolla
Code Issues Proposed changes

Merge "Add neutron-lbaas-agent to exlude image for Ubuntu binary"

This commit is contained in:
Jenkins 2016-09-12 06:28:53 +00:00 committed by Gerrit Code Review
parent ec5a90daee f59ddb3527
commit 8c0f8daa22
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -16,9 +16,11 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
# TODO(Jeffrey4l): UCA latest Newton release lack of neutron-lbaas-common
# package, just remove neutron-lbaas-agent in neutron_base_packages. Once they
# fix it, this should be reverted.
{% set neutron_base_packages = [
'iproute2',
'neutron-lbaas-agent',
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',

4
tests/test_build.py
View File

@ -90,8 +90,12 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
# TODO(Jeffrey4l): UCA latest Newton release lack of neutron-lbaas-common
# package, just add neutron-lbaas-agent into the exclude_image. Once they
# fix it, this should be reverted.
excluded_images = ["kuryr",
"neutron-networking-sfc-agent",
"neutron-lbaas-agent",
"senlin-base",
"vmtp",
"zaqar",