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/trove/trove-api/Dockerfile.j2         | 2 +-
 docker/trove/trove-base/Dockerfile.j2        | 2 +-
 docker/trove/trove-conductor/Dockerfile.j2   | 2 +-
 docker/trove/trove-guestagent/Dockerfile.j2  | 2 +-
 docker/trove/trove-taskmanager/Dockerfile.j2 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'docker/trove')

diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index c3dd29a00..8506a0549 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set trove_api_packages = ['openstack-trove-api'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set trove_api_packages = ['trove-api'] %}
     {% endif %}
 
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index 6d66203f3..f1cc2d72c 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
 
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set trove_base_packages = ['openstack-trove-common'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {{ macros.ubuntu_trove_bug_1651852() }}
         {% set trove_base_packages = [] %}
     {% endif %}
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index a8a187acf..7e807bc27 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set trove_conductor_packages = ['openstack-trove-conductor'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set trove_conductor_packages = ['trove-conductor'] %}
     {% endif %}
 
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index c5c5f8cad..5b8409eb8 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set trove_guestagent_packages = ['openstack-trove-guestagent'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set trove_guestagent_packages = ['trove-guestagent'] %}
     {% endif %}
 
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index 4d2002842..773eb69f4 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set trove_taskmanager_packages = ['openstack-trove-taskmanager'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set trove_taskmanager_packages = ['trove-taskmanager'] %}
     {% endif %}
 
-- 
cgit v1.2.3