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
31 lines
1.0 KiB
Django/Jinja
31 lines
1.0 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
# TODO(SamYaple): until packaging is fixed, all of this is required
|
|
# http://pkgs.fedoraproject.org/cgit/openstack-ironic.git/tree/openstack-ironic.spec#n78
|
|
RUN yum -y install \
|
|
openstack-ironic-common \
|
|
python-oslo-log \
|
|
python-oslo-concurrency \
|
|
python-oslo-policy \
|
|
python-oslo-versionedobjects \
|
|
&& yum clean all
|
|
|
|
{% endif %}
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD ironic-base-archive /ironic-base-source
|
|
RUN ln -s ironic-base-source/* ironic \
|
|
&& useradd --user-group ironic \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ironic \
|
|
&& mkdir -p /etc/ironic /var/log/ironic /home/ironic \
|
|
&& cp -r /ironic/etc/ironic/* /etc/ironic/ \
|
|
&& chown -R ironic: /etc/ironic /var/log/ironic /home/ironic
|
|
|
|
{% endif %}
|
|
|
|
RUN usermod -a -G kolla ironic
|