From 4d31ca695bb8d1fe5f1e7f31c14cab4e64827d96 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 22 Feb 2019 12:49:16 +0100 Subject: Move to Debian 'buster' Buster is at freeze phase so safe to update and use. Will give us Python 3 based OpenStack packages (usually release delayed). Change-Id: I48c2d252a834716f1bcf10b18f2d32fe541e8137 --- docker/nova/nova-compute/Dockerfile.j2 | 14 -------------- docker/nova/nova-libvirt/Dockerfile.j2 | 1 - 2 files changed, 15 deletions(-) (limited to 'docker/nova') 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 be503849e..4ba304576 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -58,7 +58,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 %} -- cgit v1.2.3