From 69fef5cd59286b5eeaa4deaf9da97511413ed653 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 12 Feb 2017 18:36:51 +0100 Subject: debian: enable all images enabled for Ubuntu Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357 --- docker/nova/nova-libvirt/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/nova/nova-libvirt') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index ba038bd61..7adb7ba3a 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }} 'qemu-kvm' ] %} -{% elif base_distro == 'ubuntu' %} +{% elif base_distro in ['ubuntu'] %} {% set nova_libvirt_packages = [ 'ceph-common', @@ -34,7 +34,7 @@ MAINTAINER {{ maintainer }} 'xen-utils-4.6' ] %} -{% elif base_distro == 'debian' %} +{% elif base_distro in ['debian'] %} {% set nova_libvirt_packages = [ 'ceph-common', @@ -53,7 +53,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }} -{% if base_distro in ['ubuntu', 'debian'] %} +{% if base_distro in ['debian', 'ubuntu'] %} RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml -- cgit v1.2.3