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

8 files changed, 11 insertions, 11 deletions

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 22b574e05..2f0975313 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set designate_api_packages = ['openstack-designate-api'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_api_packages = ['designate-api'] %}
     {% endif %}
 {{ macros.install_packages(designate_api_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 75db8ca44..e70d02603 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -10,14 +10,14 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
 
-{% elif base_distro in ['ubuntu'] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
    {% set designate_backend_bind9_packages = ['bind9'] %}
 
 {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
 
 {% endif %}
 
-{% set designate_backend_bind_name = 'bind' if base_distro in ['ubuntu', 'debian'] else 'named' %}
+{% set designate_backend_bind_name = 'bind' if base_distro in ['debian', 'ubuntu'] else 'named' %}
 
 RUN mkdir -p /var/lib/kolla/ /var/lib/{{ designate_backend_bind_name }}/ /run/{{ designate_backend_bind_name }} \
      && chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 393299830..dfa69c585 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -28,7 +28,7 @@ RUN cp /etc/designate/policy.json /tmp/ \
     && mv /tmp/policy.json /etc/designate/ \
     && chown designate: /etc/designate/policy.json
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_base_packages = [
             'designate-common',
             'python-tooz'
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 4f8c3de62..0e6ef8d7a 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set designate_central_packages = ['openstack-designate-central'] %}
-    {% elif base_distro in ['ubuntu']%}
+    {% elif base_distro in ['debian', 'ubuntu']%}
        {% set designate_central_packages = ['designate-central'] %}
     {% endif %}
 {{ macros.install_packages(designate_central_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 9819f4c8f..24b5dc1d6 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set designate_mdns_packages = ['openstack-designate-mdns'] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_mdns_packages = ['designate-mdns'] %}
     {% endif %}
 {{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2
index 6b84f8d0d..3d8763c62 100644
--- a/docker/designate/designate-pool-manager/Dockerfile.j2
+++ b/docker/designate/designate-pool-manager/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
             'bind',
             'openstack-designate-pool-manager'
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_pool_manager_packages = [
             'bind9',
             'designate-pool-manager'
@@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
        {% set designate_pool_manager_packages = [
             'bind'
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_pool_manager_packages = [
             'bind9'
         ] %}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 6da2f6f90..37a2802db 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
             'openstack-designate-sink',
             'python-designateclient'
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_sink_packages = [
             'designate-sink',
             'python-designateclient'
diff --git a/docker/designate/designate-worker/Dockerfile.j2 b/docker/designate/designate-worker/Dockerfile.j2
index 261884e65..98cc4c45f 100644
--- a/docker/designate/designate-worker/Dockerfile.j2
+++ b/docker/designate/designate-worker/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
             'bind',
             'openstack-designate-worker'
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_worker_packages = [
             'bind9',
             'designate-worker'
@@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
        {% set designate_worker_packages = [
             'bind'
         ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
        {% set designate_worker_packages = [
             'bind9'
         ] %}