diff options
| author | Pierre Hanselmann <pierre.hanselmann@gmail.com> | 2017-11-07 10:24:52 +0100 |
|---|---|---|
| committer | Pierre Hanselmann <pierre.hanselmann@gmail.com> | 2017-11-09 11:07:52 +0100 |
| commit | 5899b67bde3a53f27615336141921021f2e70e36 (patch) | |
| tree | 3e73db50f140cc6e28423fc030ea13156060adc4 /docker | |
| parent | f4731f7a6da5031b8acc2c260427a3ee376cc3b3 (diff) | |
| download | kolla-5899b67bde3a53f27615336141921021f2e70e36.tar.gz kolla-5899b67bde3a53f27615336141921021f2e70e36.zip | |
Add missing vmware libs
Neutron and Cinder base images doesn't include the necessary
vmware libs. If we enable vmware nsx (nsxv or dvs) we need those
libraries to be available.
Closes-Bug: #1730662
Change-Id: I94005728fbce8320d7cf9d3b746978d8c7634ed5
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 2d8ac80d4..a17aa656c 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -13,13 +13,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ceph-common', 'lvm2', 'openstack-cinder', - 'python-automaton' + 'python-automaton', + 'python-oslo-vmware' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_base_packages = [ 'ceph-common', 'cinder-common', - 'lvm2' + 'lvm2', + 'python-oslo.vmware' ] %} {% endif %} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index d4c55ccbe..774562822 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -23,6 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-neutron-ml2', 'openvswitch', 'python-networking-sfc', + 'python-networking-vmware-nsx', 'python-openvswitch', 'python2-oslo-vmware' ] %} @@ -38,6 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-server', 'openvswitch-switch', 'python-networking-sfc', + 'python-networking-vmware-nsx', 'python-openvswitch', 'python-oslo.vmware' ] %} @@ -56,7 +58,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-networking-sfc', 'python-neutron-fwaas', 'python-openvswitch', - 'python-oslo.vmware' + 'python-oslo.vmware', + 'python-vmware-nsx' ] %} {% endif %} |