diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-07 18:58:18 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-05-08 11:16:43 +0100 |
| commit | d50cc5d5d4a577ddd87f1e6bc77d25c509a31cb6 (patch) | |
| tree | 2121fc6fbaff9f0783694e72905e258c883b298f | |
| parent | 59ec7c7cf240da409c293e30ce7f0599542ad7a7 (diff) | |
| download | kolla-d50cc5d5d4a577ddd87f1e6bc77d25c509a31cb6.tar.gz kolla-d50cc5d5d4a577ddd87f1e6bc77d25c509a31cb6.zip | |
base/nova-compute: install udev/systemd to satisfy dependencies
For Debian we use 'stretch-backports' image due to requirements of some
images. That means that we also have systemd from backports. This breaks
'open-iscsi' (base) and 'python-guestfs' (nova-compute) installation.
Solution is to install 'udev' and 'systemd' in proper versions.
INFO:kolla.common.utils.base:Some packages could not be installed. This may mean that you have
INFO:kolla.common.utils.base:requested an impossible situation or if you are using the unstable
INFO:kolla.common.utils.base:distribution that some required packages have not yet been created
INFO:kolla.common.utils.base:or been moved out of Incoming.
INFO:kolla.common.utils.base:The following information may help to resolve the situation:
INFO:kolla.common.utils.base:The following packages have unmet dependencies:
INFO:kolla.common.utils.base: open-iscsi : Depends: udev but it is not going to be installed
INFO:kolla.common.utils.base:E: Unable to correct problems, you have held broken packages.
INFO:kolla.common.utils.nova-compute: python-guestfs : Depends: libguestfs0 (= 1:1.34.6-2) but it is not going to be installed
INFO:kolla.common.utils.nova-compute:E: Unable to correct problems, you have held broken packages.
Closes-bug: #1769850
Change-Id: I4865c279d665cf34fc150794c01368a1602319f0
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index cf1370ec6..c5bda8c76 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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' ] %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 863621177..de8f1c821 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -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' %} |
