cda0459ad1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
42 lines
1.1 KiB
Django/Jinja
42 lines
1.1 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install openstack-cinder \
|
|
python-automaton \
|
|
lvm2 \
|
|
ceph-common \
|
|
&& yum clean all \
|
|
&& mkdir -p /etc/ceph
|
|
|
|
{% endif %}
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install lvm2 \
|
|
&& yum clean all
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
RUN apt-get install -y --no-install-recommends \
|
|
lvm2 \
|
|
ceph-common \
|
|
&& apt-get clean \
|
|
&& mkdir -p /etc/ceph
|
|
|
|
{% endif %}
|
|
|
|
ADD cinder-base-archive /cinder-base-source
|
|
RUN ln -s cinder-base-source/* cinder \
|
|
&& useradd --user-group cinder \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /cinder \
|
|
&& mkdir -p /etc/cinder /var/log/cinder /home/cinder \
|
|
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
|
|
&& chown -R cinder: /etc/cinder /var/log/cinder /home/cinder
|
|
|
|
{% endif %}
|
|
|
|
RUN usermod -a -G kolla cinder
|