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-compute/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/nova/nova-compute') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 164abf83e..51c7ffaef 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388 {% set nova_compute_packages = [ @@ -62,7 +62,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'targetcli' ] %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set nova_compute_packages = [ 'ceph-common', -- cgit v1.2.3