a9d08726f5
Currently if the install_packages macro is run with an empty package list, it will add a yum or apt-get command with no packages listed. This bug fix aims to omit this line when no packages have been given, or, the operator wants to use the "_override" / "_remove" functionality to disable all packages being installed in a Dockerfile. Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb Closes-bug: 1612446
72 lines
2.3 KiB
Django/Jinja
72 lines
2.3 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set cinder_base_packages = [
|
|
'openstack-cinder',
|
|
'python-automaton',
|
|
'lvm2',
|
|
'ceph-common'
|
|
] %}
|
|
|
|
{% elif base_distro in ['ubuntu'] %}
|
|
|
|
{% set cinder_base_packages = [
|
|
'cinder-common',
|
|
'ceph-common',
|
|
'lvm2'
|
|
] %}
|
|
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
{% set cinder_base_packages = [
|
|
'lvm2',
|
|
'qemu-img',
|
|
'ceph-common'
|
|
] %}
|
|
|
|
{% elif base_distro in ['ubuntu', 'debian'] %}
|
|
|
|
{% set cinder_base_packages = [
|
|
'lvm2',
|
|
'qemu-utils',
|
|
'ceph-common'
|
|
] %}
|
|
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
|
|
|
|
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/lib/cinder /home/cinder \
|
|
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
|
|
&& chown -R cinder: /etc/cinder /var/lib/cinder /home/cinder \
|
|
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/cinder/rootwrap.conf
|
|
|
|
{% endif %}
|
|
|
|
COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN usermod -a -G kolla cinder \
|
|
&& mkdir -p /etc/ceph \
|
|
&& chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \
|
|
&& touch /usr/local/bin/kolla_cinder_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
|
|
|
|
{% block cinder_base_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|