diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 04:09:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 04:09:25 +0000 |
| commit | a130ecb153f555ffd96bebf554eaa10c34a1486d (patch) | |
| tree | 91b3e651f4e83950668c3f2970cd74ef997a442f /docker/neutron | |
| parent | 6560e23b92379854c5823f2c5bd95ce03ed763d7 (diff) | |
| parent | 6f02261248556d6917a8de6529b3c99a28893230 (diff) | |
| download | kolla-a130ecb153f555ffd96bebf554eaa10c34a1486d.tar.gz kolla-a130ecb153f555ffd96bebf554eaa10c34a1486d.zip | |
Merge "Add vSphere Support"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 05b65f7a8..195668cca 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -11,6 +11,7 @@ MAINTAINER {{ maintainer }} {% set neutron_server_packages = [ 'openstack-neutron-lbaas', 'openstack-neutron-vpnaas', + 'python-oslo-vmware' ] %} {% elif base_distro in ['ubuntu'] %} @@ -19,13 +20,23 @@ MAINTAINER {{ maintainer }} 'neutron-lbaasv2-agent', 'python-neutron-lbaas', 'python-neutron-vpnaas', + 'python-oslo-vmware' ] %} {% endif %} -{% endif %} {{ macros.install_packages(neutron_server_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + + {% set neutron_server_pip_packages = [ + 'oslo-vmware' + ] %} + +RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} + +{% endif %} + ADD plugins-archive / {% set neutron_server_plugins_pip_packages = [ |