openstack
/
kolla
Code Issues Proposed changes

Merge "Fix wrong extra name for glance_store" into stable/ocata

This commit is contained in:
Jenkins 2017-07-16 17:14:16 +00:00 committed by Gerrit Code Review
parent 22973121f8 6ddb60e3e0
commit dfe7526dbc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,11 +12,14 @@ MAINTAINER {{ maintainer }}
{% set glance_base_packages = [
'openstack-glance',
'python-rbd',
'python-oslo-vmware',
'python-rados'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set glance_base_packages = [
'glance',
'python-os-brick',
'python-oslo.vmware',
'python-rbd',
'python-rados'
] %}
@ -34,7 +37,7 @@ MAINTAINER {{ maintainer }}
ADD glance-base-archive /glance-base-source
RUN ln -s glance-base-source/* glance \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /glance[cinder] \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /glance glance_store[cinder,vmware,swift] \
&& mkdir -p /etc/glance \
&& cp -r /glance/etc/* /etc/glance/ \
&& chown -R glance: /etc/glance