From 69fef5cd59286b5eeaa4deaf9da97511413ed653 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
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/keystone/keystone-base/Dockerfile.j2   | 6 +++---
 docker/keystone/keystone-fernet/Dockerfile.j2 | 2 +-
 docker/keystone/keystone-ssh/Dockerfile.j2    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 2f06dc1b6..092a038e7 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -25,7 +25,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
     && 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 keystone_base_packages = [
             'apache2',
             'keystone',
@@ -38,7 +38,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
     && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
     && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
     && echo > /etc/apache2/ports.conf \
-    && rm /etc/apache2/sites-enabled/keystone.conf
+    && rm -f /etc/apache2/sites-enabled/keystone.conf
 
     {% endif %}
 {% elif install_type == 'source' %}
@@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
 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', 'debian'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set keystone_base_packages = [
             'apache2',
             'libapache2-mod-wsgi',
diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2
index 2f72d4e42..d2c4d741e 100644
--- a/docker/keystone/keystone-fernet/Dockerfile.j2
+++ b/docker/keystone/keystone-fernet/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
         'openssh-clients',
         'rsync'
     ] %}
-{% elif base_distro in ['ubuntu', 'debian'] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
     {% set keystone_fernet_packages = [
         'cron',
         'openssh-client',
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2
index 2f919fe9c..1e795f297 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/docker/keystone/keystone-ssh/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
         'openssh-server',
         'rsync'
     ] %}
-{% elif base_distro in ['ubuntu', 'debian'] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
     {% set keystone_ssh_packages = [
         'openssh-server',
         'rsync'
-- 
cgit v1.2.3