Merge "debian: enable all images enabled for Ubuntu"

10 files changed, 25 insertions, 14 deletions

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 41426fe76..b95e02c51 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.configure_user(name='neutron') }}
 
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
 {{ macros.debian_haproxy_existing_user_fix() }}
 {% endif %}
 
@@ -23,6 +23,17 @@ MAINTAINER {{ maintainer }}
             'python-openvswitch'
         ] %}
 
+    {% elif base_distro in ['debian'] %}
+
+        {% set neutron_base_packages = [
+            'iproute2',
+            'keepalived',
+            'neutron-plugin-ml2',
+            'neutron-server',
+            'openvswitch-switch',
+            'python-openvswitch'
+        ] %}
+
     {% elif base_distro in ['ubuntu'] %}
 
         {% set neutron_base_packages = [
@@ -39,7 +50,7 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
 
-    {% if base_distro in ['ubuntu'] %}
+    {% if base_distro in ['debian', 'ubuntu'] %}
 
 RUN mkdir -p /usr/share/neutron \
     && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
@@ -61,7 +72,7 @@ RUN mkdir -p /usr/share/neutron \
             'uuid'
         ] %}
 
-    {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_base_packages = [
             'conntrack',
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
index c49919238..821023408 100644
--- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
@@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
     {% if install_type == 'binary' %}
 
         {% set neutron_dhcp_agent_packages = [
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2
index 96f2a0eca..8d5e5cb9c 100644
--- a/docker/neutron/neutron-l3-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2
@@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['ubuntu', 'debian'] %}
+    {% if base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_l3_agent_packages = [
             'neutron-l3-agent'
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
index 79694dc49..e755b6a42 100644
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
@@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
             'openstack-neutron-lbaas'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_lbaas_agent_packages = [
             'neutron-lbaas-common',
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 5f894d26c..20f160c2e 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
             'openstack-neutron-linuxbridge'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_linuxbridge_agent_packages = [
             'ebtables',
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
index 97685abf6..1dca933d5 100644
--- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
@@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
     {% if install_type == 'binary' %}
 
         {% set neutron_metadata_agent_packages = [
diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2
index dcdf8f240..e12c23f4a 100644
--- a/docker/neutron/neutron-metering-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
 
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
-    {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
     {% endif %}
 
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index 1a3c52875..ad3329352 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
@@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
             'openvswitch'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_openvswitch_agent_packages = [
             'neutron-plugin-openvswitch-agent',
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 195668cca..535aeae72 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
             'python-oslo-vmware'
         ] %}
 
-    {% elif base_distro in ['ubuntu'] %}
+    {% elif base_distro in ['debian', 'ubuntu'] %}
 
         {% set neutron_server_packages = [
             'neutron-lbaasv2-agent',
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
index 0a0241a47..5b18c5457 100644
--- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
@@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
             'openstack-neutron-vpn-agent',
             'openswan'
        ] %}
-   {% elif base_distro in ['ubuntu', 'debian'] %}
+   {% elif base_distro in ['debian', 'ubuntu'] %}
       {% set neutron_vpnaas_agent_packages = [
             'neutron-vpn-agent',
             'strongswan'
@@ -26,7 +26,7 @@ MAINTAINER {{ maintainer }}
        {% set neutron_vpnaas_agent_packages = [
             'openswan'
        ] %}
-   {% elif base_distro in ['ubuntu', 'debian'] %}
+   {% elif base_distro in ['debian', 'ubuntu'] %}
       {% set neutron_vpnaas_agent_packages = [
             'strongswan'
       ] %}
@@ -55,6 +55,6 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
 # TODO(pbourke): The libreswan driver required by redhat derived bases
 # currently requires root in Neutron. Remove this if condition once
 # https://bugs.launchpad.net/neutron/+bug/1644517 is addressed.
-{% if base_distro in ['ubuntu', 'debian'] %}
+{% if base_distro in ['debian', 'ubuntu'] %}
 USER neutron
 {% endif %}