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/cinder/cinder-api/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/cinder/cinder-api') diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 828dcd943..bd9cc931e 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_api_packages = [ 'apache2', 'cinder-api', @@ -36,7 +36,7 @@ RUN echo > /etc/apache2/ports.conf {{ macros.install_packages(cinder_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_api_packages = [ 'apache2', 'libapache2-mod-wsgi' -- cgit v1.2.3