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/glance/glance-api/Dockerfile.j2 | 2 +- docker/glance/glance-base/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 4ef6edbfc..b6d3b112f 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set glance_api_packages = ['qemu-img'] %} -{% elif base_distro in ['ubuntu'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set glance_api_packages = ['qemu-utils'] %} {% endif %} diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 8a86f9906..c83c940c2 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }} 'python-rados', 'python-rbd' ] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set glance_base_packages = [ 'glance', 'python-rados', -- cgit v1.2.3