diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-10 17:12:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-10 17:12:02 +0000 |
| commit | 8edf1435d310d6e5e9956dbe42f01b3f6e24fee0 (patch) | |
| tree | 64b34ad212ac507b97fad1fd1323dcf63b045646 | |
| parent | 2f271522589e5d2956611787508b5b3ae44ca84b (diff) | |
| parent | d50cc5d5d4a577ddd87f1e6bc77d25c509a31cb6 (diff) | |
| download | kolla-8edf1435d310d6e5e9956dbe42f01b3f6e24fee0.tar.gz kolla-8edf1435d310d6e5e9956dbe42f01b3f6e24fee0.zip | |
Merge "base/nova-compute: install udev/systemd to satisfy dependencies"
| -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 fac3343ff..264d87dd2 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' %} |