From 6f02261248556d6917a8de6529b3c99a28893230 Mon Sep 17 00:00:00 2001 From: jimmygc Date: Wed, 5 Apr 2017 09:19:35 +0800 Subject: Add vSphere Support Add oslo.vmware and vmware_nsx packages into kolla. Change-Id: I2a1ed314b970a4832f7f8256c1929921f36069f2 Implements: blueprint kolla-support-vsphere Co-Authored-By: shaofeng cheng --- docker/neutron/neutron-server/Dockerfile.j2 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'docker/neutron') 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 = [ -- cgit v1.2.3