diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 06:28:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 06:28:53 +0000 |
| commit | 8c0f8daa22e3163041fc2bb5cd1ba5939247e600 (patch) | |
| tree | 5738462ecf660d1bef561e9c0ebf131ea5ffd7c8 /docker | |
| parent | ec5a90daeec4e79a365bb2f6ba98171609daf467 (diff) | |
| parent | f59ddb352774bb7bf082a3c45b4640d1085f4107 (diff) | |
| download | kolla-8c0f8daa22e3163041fc2bb5cd1ba5939247e600.tar.gz kolla-8c0f8daa22e3163041fc2bb5cd1ba5939247e600.zip | |
Merge "Add neutron-lbaas-agent to exlude image for Ubuntu binary"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 05a2b7c75..5e9b6218e 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', |