diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-04 15:58:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-04 15:58:14 +0000 |
| commit | 3443eaddcdd859f8a411687910339e19ca044cb2 (patch) | |
| tree | 38d93f95654b15f1de414b75fc71979d5628688e /docker | |
| parent | e623d95f2d1de9d45350cc4394deeb7239abc69d (diff) | |
| parent | e5ca556b4234bffe582e36a30c75f72a989f6c5d (diff) | |
| download | kolla-3443eaddcdd859f8a411687910339e19ca044cb2.tar.gz kolla-3443eaddcdd859f8a411687910339e19ca044cb2.zip | |
Merge "Add networking-hyperv driver when building neutron-server image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 5273d02be..979041416 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -30,7 +30,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% set neutron_server_pip_packages = [ - 'oslo-vmware' + 'oslo-vmware', + '"networking-hyperv<=4.0.0"' ] %} {% set neutron_server_plugins_pip_packages = [ |