openstack
/
kolla
Code Issues Proposed changes

Merge "Add missing vmware libs"

This commit is contained in:
Zuul 2017-11-12 05:20:36 +00:00 committed by Gerrit Code Review
parent 83c54df459 5899b67bde
commit a9c8f6abad
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -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")) }}

5
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -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 %}