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/nova | |
| parent | 6560e23b92379854c5823f2c5bd95ce03ed763d7 (diff) | |
| parent | 6f02261248556d6917a8de6529b3c99a28893230 (diff) | |
| download | kolla-a130ecb153f555ffd96bebf554eaa10c34a1486d.tar.gz kolla-a130ecb153f555ffd96bebf554eaa10c34a1486d.zip | |
Merge "Add vSphere Support"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 20 |
1 files changed, 16 insertions, 4 deletions
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 |