docker: drop binary parts

Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3

11 files changed, 67 insertions, 260 deletions

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 9d597b6fe..3c07fa500 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -10,82 +10,45 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['openvswitch']) }}
 {{ macros.configure_user(name='neutron') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set neutron_base_packages = [
-            'iputils',
-            'keepalived',
-            'net-tools',
-            'radvd',
-            'openstack-neutron',
-            'openstack-neutron-ml2',
-            'openvswitch',
-            'python3-networking-baremetal',
-            'python3-networking-sfc',
-            'python3-openvswitch',
-            'python3-oslo-vmware'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_base_packages = [
-            'iproute2',
-            'iputils-ping',
-            'keepalived',
-            'net-tools',
-            'radvd',
-            'neutron-plugin-ml2',
-            'neutron-server',
-            'openvswitch-switch',
-            'python3-networking-sfc',
-            'python3-openvswitch',
-            'python3-oslo.vmware'
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+
+    {% set neutron_base_packages = [
+        'conntrack-tools',
+        'dnsmasq',
+        'dnsmasq-utils',
+        'haproxy',
+        'ipset',
+        'iptables',
+        'iputils',
+        'keepalived',
+        'net-tools',
+        'openvswitch',
+        'python3-openvswitch',
+        'radvd',
+        'uuid'
+    ] %}
+
+{% elif base_package_type == 'deb' %}
+
+    {% set neutron_base_packages = [
+        'conntrack',
+        'dnsmasq',
+        'dnsmasq-utils',
+        'haproxy',
+        'iproute2',
+        'ipset',
+        'iptables',
+        'iputils-arping',
+        'iputils-ping',
+        'keepalived',
+        'net-tools',
+        'openvswitch-switch',
+        'python3-openvswitch',
+        'radvd',
+        'uuid-runtime'
+    ] %}
 
-{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set neutron_base_packages = [
-            'conntrack-tools',
-            'dnsmasq',
-            'dnsmasq-utils',
-            'haproxy',
-            'ipset',
-            'iptables',
-            'iputils',
-            'keepalived',
-            'net-tools',
-            'openvswitch',
-            'python3-openvswitch',
-            'radvd',
-            'uuid'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_base_packages = [
-            'conntrack',
-            'dnsmasq',
-            'dnsmasq-utils',
-            'haproxy',
-            'iproute2',
-            'ipset',
-            'iptables',
-            'iputils-arping',
-            'iputils-ping',
-            'keepalived',
-            'net-tools',
-            'openvswitch-switch',
-            'python3-openvswitch',
-            'radvd',
-            'uuid-runtime'
-        ] %}
-
-    {% endif %}
+{% endif %}
 
 {{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
 
@@ -118,8 +81,6 @@ RUN ln -s neutron-base-source/* neutron \
         done; \
     fi
 
-{% endif %}
-
 COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
index 7cb7cbfd9..76e7a5fea 100644
--- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
+++ b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2
@@ -7,22 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm'  %}
-        {% set neutron_bgp_dragent_packages = [
-            'openstack-neutron-bgp-dragent'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-        {% set neutron_bgp_dragent_packages = [
-            'neutron-bgp-dragent'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(neutron_bgp_dragent_packages | customizable("packages")) }}
-
-{% elif install_type == 'source'  %}
-
 ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source
 
     {% set neutron_bgp_dragent_pip_packages = [
@@ -32,8 +16,6 @@ ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source
 RUN ln -s neutron-bgp-dragent-source/* neutron_dynamic_routing \
     && {{ macros.install_pip(neutron_bgp_dragent_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block neutron_bgp_dragent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
index 82d2b9484..11bcb432e 100644
--- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2
@@ -7,13 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_package_type == 'deb' %}
-    {% if install_type == 'binary' %}
-        {% set neutron_dhcp_agent_packages = [
-            'neutron-dhcp-agent'
-        ] %}
-    {% endif %}
-{% endif %}
+{% set neutron_dhcp_agent_packages = [
+] %}
 
 {{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
 
diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2
index c7859a1a8..7aed7e2f6 100644
--- a/docker/neutron/neutron-l3-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2
@@ -7,44 +7,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-   {% if base_package_type == 'rpm' %}
-       {% set neutron_l3_agent_packages = [
-            'openstack-neutron-vpn-agent',
-            'libreswan'
-       ] %}
-
-# TODO(chenxing) Currently, there is no Ubuntu vpnaas package for Queens release.
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_l3_agent_packages = [
-            'neutron-l3-agent',
-            'strongswan'
-        ] %}
-
-   {% endif %}
-
-{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-   {% if base_package_type == 'rpm' %}
-       {% set neutron_l3_agent_packages = [
-            'libreswan',
-            'radvd',
-            'dibbler-client'
-       ] %}
-   {% elif base_package_type == 'deb' %}
-      {% set neutron_l3_agent_packages = [
-            'strongswan',
-            'radvd',
-            'dibbler-client'
-      ] %}
-   {% endif %}
+{% if base_package_type == 'rpm' %}
+   {% set neutron_l3_agent_packages = [
+      'libreswan',
+      'radvd',
+      'dibbler-client'
+   ] %}
+{% elif base_package_type == 'deb' %}
+   {% set neutron_l3_agent_packages = [
+      'strongswan',
+      'radvd',
+      'dibbler-client'
+   ] %}
+{% endif %}
 
 {{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}
 
-{% endif %}
-
 {% block neutron_l3_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 284754a76..ae37ac6e3 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -7,30 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set neutron_linuxbridge_agent_packages = [
-            'ebtables',
-            'openstack-neutron-linuxbridge'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_linuxbridge_agent_packages = [
-            'ebtables',
-            'neutron-linuxbridge-agent'
-        ] %}
-
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-    {% set neutron_linuxbridge_agent_packages = [
-        'ebtables'
-    ] %}
-
-{% endif %}
+{% set neutron_linuxbridge_agent_packages = [
+    'ebtables'
+] %}
 
 {{ macros.install_packages(neutron_linuxbridge_agent_packages | customizable("packages")) }}
 
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
index 96e2fddd4..625636b7d 100644
--- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
@@ -7,15 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_package_type == 'deb' %}
-    {% if install_type == 'binary' %}
-
-        {% set neutron_metadata_agent_packages = [
-            'neutron-metadata-agent'
-        ] %}
-
-    {% endif %}
-{% endif %}
+{% set neutron_metadata_agent_packages = [
+] %}
 
 {{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }}
 
diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2
index e4950a084..1a4eda537 100644
--- a/docker/neutron/neutron-metering-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2
@@ -7,19 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
-    {% endif %}
-
-{{ macros.install_packages(neutron_metering_agent_packages | customizable("packages")) }}
-
-{% endif %}
-
-
 {% block neutron_metering_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
index 5e28049e0..ec7243e57 100644
--- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
@@ -14,26 +14,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     'python3-ethtool',
 ] %}
 
-{% if install_type == 'binary' %}
-
-    {% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
-        'python3-networking-mlnx'
-    ] %}
-
-{% endif %}
-
 {{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
 
-{% if install_type == 'source' %}
-
-    {% set neutron_mlnx_agent_pip_packages = [
-            'networking-mlnx'
-    ] %}
+{% set neutron_mlnx_agent_pip_packages = [
+    'networking-mlnx'
+] %}
 
 RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block neutron_mlnx_agent_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index e35478a7a..82f02aeb2 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
@@ -7,23 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set neutron_openvswitch_agent_packages = [
-            'libibverbs',
-            'openstack-neutron-openvswitch'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_openvswitch_agent_packages = [
-            'neutron-openvswitch-agent'
-        ] %}
-
-    {% endif %}
-{% endif %}
-
 {{ macros.install_packages(neutron_openvswitch_agent_packages | customizable("packages")) }}
 
 {% block neutron_openvswitch_agent_footer %}{% endblock %}
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index f1c4ee1e8..bde58cb26 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -7,34 +7,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set neutron_server_packages = [
-            'openstack-neutron-vpnaas',
-            'python3-networking-generic-switch'
-        ] %}
+{% set neutron_server_pip_packages = [
+    'networking-hyperv'
+] %}
 
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_server_packages = [
-            'python3-ironic-neutron-agent',
-            'python3-neutron-dynamic-routing',
-            'python3-neutron-vpnaas'
-        ] %}
-
-    {% endif %}
-
-{{ macros.install_packages(neutron_server_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
-    {% set neutron_server_pip_packages = [
-            'networking-hyperv'
-    ] %}
-
-    {% set neutron_server_plugins_pip_packages = [
-        '/plugins/*'
-    ] %}
+{% set neutron_server_plugins_pip_packages = [
+    '/plugins/*'
+] %}
 
 ADD plugins-archive /
 RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} \
@@ -42,8 +21,6 @@ RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packag
            {{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \
        fi
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
 RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
 
diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/docker/neutron/neutron-sriov-agent/Dockerfile.j2
index 6660296e3..6f43080a0 100644
--- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-sriov-agent/Dockerfile.j2
@@ -7,22 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set neutron_sriov_agent_packages = [
-            'openstack-neutron-sriov-nic-agent'
-        ] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set neutron_sriov_agent_packages = [
-            'neutron-sriov-agent'
-        ] %}
-
-    {% endif %}
-{% endif %}
-
 {{ macros.install_packages(neutron_sriov_agent_packages | customizable("packages")) }}
 
 {% block neutron_sriov_agent_footer %}{% endblock %}