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/nova/nova-compute/Dockerfile.j2 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 164abf83e..5963b1593 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -17,7 +17,8 @@ MAINTAINER {{ maintainer }} 'openvswitch', 'python-rtslib', 'sysfsutils', - 'targetcli' + 'targetcli', + 'python-oslo-vmware' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -36,7 +37,8 @@ MAINTAINER {{ maintainer }} 'python-ironicclient', 'python-rtslib', 'sysfsutils', - 'targetcli' + 'targetcli', + 'python-oslo-vmware' ] %} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} @@ -84,7 +86,8 @@ RUN mkdir -p /etc/ceph {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} {% set nova_compute_pip_packages = [ - 'libvirt-python' + 'libvirt-python', + 'oslo-vmware' ] %} @@ -92,9 +95,18 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages {% endif %} +ADD plugins-archive / + +{% set nova_compute_plugins_pip_packages = [ + '/plugins/*' +] %} + COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \ - && rm -f /etc/machine-id + && rm -f /etc/machine-id \ + && if [ "$(ls /plugins)" ]; then \ + {{ macros.install_pip(nova_compute_plugins_pip_packages | customizable("pip_packages")) }}; \ + fi ENV PATH $PATH:/lib/udev -- cgit v1.2.3