Merge "debian: enable all images enabled for Ubuntu"

13 files changed, 20 insertions, 20 deletions

diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index f6cd1794b..e31d7abc2 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
 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 nova_api_packages = [
             'apache2',
@@ -44,7 +44,7 @@ RUN echo > /etc/apache2/ports.conf
 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 nova_api_packages = [
             'apache2',
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index c8aac292d..c3bc21d89 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
                 'python-keystoneclient'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_base_packages = [
                 'bridge-utils',
@@ -39,7 +39,7 @@ MAINTAINER {{ maintainer }}
                 'openvswitch'
         ] %}
 
-    {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_base_packages = [
             'bridge-utils',
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 65fe986f9..04ba49070 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/Dockerfile.j2
@@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_compute_ironic_packages = [
             'nova-compute'
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 5963b1593..256c92d23 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         # ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
         {% set nova_compute_packages = [
@@ -64,7 +64,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'targetcli'
         ] %}
 
-    {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_compute_packages = [
             'ceph-common',
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index 95d56b394..b2c1cc23e 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
             'openstack-nova-conductor'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_conductor_packages = [
             'nova-conductor'
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index d87009a26..b80a68329 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
             'openstack-nova-console'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_consoleauth_packages = [
             'nova-consoleauth',
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index ba038bd61..7adb7ba3a 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }}
         'qemu-kvm'
     ] %}
 
-{% elif base_distro == 'ubuntu' %}
+{% elif base_distro in ['ubuntu'] %}
 
     {% set nova_libvirt_packages = [
         'ceph-common',
@@ -34,7 +34,7 @@ MAINTAINER {{ maintainer }}
         'xen-utils-4.6'
     ] %}
 
-{% elif base_distro == 'debian' %}
+{% elif base_distro in ['debian'] %}
 
     {% set nova_libvirt_packages = [
         'ceph-common',
@@ -53,7 +53,7 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}
 
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
 
 RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml
 
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index aa8a5dde5..62cc9b5f3 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/Dockerfile.j2
@@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
             'openstack-nova-novncproxy'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_novncproxy_packages = [
             'nova-novncproxy'
diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2
index 41319412c..69405dee2 100644
--- a/docker/nova/nova-placement-api/Dockerfile.j2
+++ b/docker/nova/nova-placement-api/Dockerfile.j2
@@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
 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 nova_placement_api_packages = [
                 'apache2',
@@ -43,7 +43,7 @@ RUN truncate -s 0 /etc/apache2/ports.conf
 {{ macros.install_packages(nova_placement_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 nova_placement_api_packages = [
                 'apache2',
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index c17c46fd4..f7ddb228f 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
@@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
             'openstack-nova-scheduler'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_scheduler_packages = [
             'nova-scheduler'
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index 1d29b3165..a0f222886 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/Dockerfile.j2
@@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
         {% set nova_serialproxy_packages = [
              'openstack-nova-serialproxy'
          ] %}
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set nova_serialproxy_packages = [
              'nova-serialproxy'
          ] %}
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 69a412a0a..88e6c3aa9 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
             'spice-html5'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_spicehtml5proxy_packages = [
             'nova-spiceproxy',
@@ -31,7 +31,7 @@ MAINTAINER {{ maintainer }}
             'spice-html5'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set nova_spicehtml5proxy_packages = [
             'spice-html5',
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index f54f4cdc6..bbee5dbe3 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/docker/nova/nova-ssh/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
     'openssh-server'
 ] %}
 
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
 
 RUN mkdir -p /var/run/sshd \
     && chmod 0755 /var/run/sshd