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 /docker/nova | |
| parent | 2f271522589e5d2956611787508b5b3ae44ca84b (diff) | |
| parent | d50cc5d5d4a577ddd87f1e6bc77d25c509a31cb6 (diff) | |
| download | kolla-8edf1435d310d6e5e9956dbe42f01b3f6e24fee0.tar.gz kolla-8edf1435d310d6e5e9956dbe42f01b3f6e24fee0.zip | |
Merge "base/nova-compute: install udev/systemd to satisfy dependencies"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
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' %} |