openstack/kolla
Code Issues Proposed changes

Merge "base/nova-compute: install udev/systemd to satisfy dependencies"

Browse Source
This commit is contained in:
Zuul 2018-05-10 17:12:02 +00:00 committed by Gerrit Code Review
commit 8edf1435d3
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/base/Dockerfile.j2
View File

@ -303,6 +303,11 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'sudo',
'tgt']
%}
{% if base_distro in ['debian'] %}
{% set base_apt_packages = base_apt_packages + [ 'udev/stretch-backports' ] %}
{% endif %}
{% set base_compiler_packages = [
'build-essential'
] %}

4
docker/nova/nova-compute/Dockerfile.j2
View File

@ -48,9 +48,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
# Debian/stretch uses rtslib-fb (like CentOS does)
# systemd is needed to get python-guestfs installed
{% if base_distro == 'debian' %}
{% set nova_compute_packages = nova_compute_packages + [
'python-rtslib-fb',
'systemd/stretch-backports',
'targetcli-fb'
] %}
{% elif base_distro == 'ubuntu' %}
@ -111,9 +113,11 @@ RUN rm -f /etc/nova/nova-compute.conf
{% endif %}
# Debian/stretch uses rtslib-fb (like CentOS does)
# systemd is needed to get python-guestfs installed
{% if base_distro == 'debian' %}
{% set nova_compute_packages = nova_compute_packages + [
'python-rtslib-fb',
'systemd/stretch-backports',
'targetcli-fb'
] %}
{% elif base_distro == 'ubuntu' %}