diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-15 19:16:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-15 19:16:54 +0000 |
| commit | debe4179824005afeaa0d89ab68a9a8acd42103a (patch) | |
| tree | fe5299b7741b45f0bdfbfb25daac3dcfd4a9086e /docker/nova | |
| parent | c25f67e9d9116c179d871b728ea38dee3acdea02 (diff) | |
| parent | 4d31ca695bb8d1fe5f1e7f31c14cab4e64827d96 (diff) | |
| download | kolla-debe4179824005afeaa0d89ab68a9a8acd42103a.tar.gz kolla-debe4179824005afeaa0d89ab68a9a8acd42103a.zip | |
Merge "Move to Debian 'buster'"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 8f58e2b74..6ddc2e5b3 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -61,13 +61,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'targetcli-fb' ] %} - # systemd is needed to get python-guestfs installed - {% if base_distro == 'debian' %} - {% set nova_compute_packages = nova_compute_packages + [ - 'systemd/stretch-backports' - ] %} - {% endif %} - {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} RUN rm -f /etc/nova/nova-compute.conf @@ -120,13 +113,6 @@ RUN rm -f /etc/nova/nova-compute.conf ] %} {% endif %} - # systemd is needed to get python-guestfs installed - {% if base_distro == 'debian' %} - {% set nova_compute_packages = nova_compute_packages + [ - 'systemd/stretch-backports' - ] %} - {% endif %} - RUN mkdir -p /etc/ceph {% endif %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index a8311e418..48410c801 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -59,7 +59,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['debian'] %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'libpam-systemd/stretch-backports', 'usermode' ] %} {% endif %} |