From f59ddb352774bb7bf082a3c45b4640d1085f4107 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sun, 11 Sep 2016 02:19:56 +0800
Subject: [PATCH] Add neutron-lbaas-agent to exlude image for Ubuntu binary
UCA latest Newton release lack of neutron-lbaas-common package, disable
neutron-lbaas-agent for Ubuntu binary until they fix it.
TrivialFix
Change-Id: I2c02fc578cffe82918ae6affe6cf0e6095ae47e4
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
---
docker/neutron/neutron-base/Dockerfile.j2 | 4 +++-
tests/test_build.py | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 05a2b7c75b..5e9b6218e5 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -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',
diff --git a/tests/test_build.py b/tests/test_build.py
index 86258b363b..2c8fd9032a 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -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",