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

6 files changed, 12 insertions, 98 deletions

diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index 8ad7ce9f6..592fdb672 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -7,17 +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 swift_acount_packages = ['openstack-swift-account'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_acount_packages = ['swift-account'] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_acount_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block swift_account_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 6ef3db124..98e10a2e6 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -9,39 +9,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='swift') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set swift_base_packages = [
-            'nmap-ncat',
-            'openstack-swift',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_base_packages = [
-            'netcat-openbsd',
-            'rsync',
-            'swift',
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
-    {# NOTE(mgoddard): UCA packages seem to modify the group membership for #}
-    {# the swift user, removing it from the kolla group. #}
-    {% if base_package_type == 'deb' %}
-RUN usermod --append --groups kolla swift
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set swift_base_packages = [
-            'liberasurecode-devel',
-            'nmap-ncat',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_base_packages = [
-            'liberasurecode-dev',
-            'netcat-openbsd',
-            'rsync',
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set swift_base_packages = [
+        'liberasurecode-devel',
+        'nmap-ncat',
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set swift_base_packages = [
+        'liberasurecode-dev',
+        'netcat-openbsd',
+        'rsync',
+    ] %}
+{% endif %}
 
 {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
 
@@ -56,7 +35,6 @@ RUN ln -s swift-base-source/* swift \
     && mkdir -p /etc/swift /var/cache/swift /var/lock/swift \
     && cp -r /swift/etc/* /etc/swift/ \
     && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift
-{% endif %}
 
 COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap
 COPY rootwrap.conf /etc/swift/rootwrap.conf
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index 4d8532f72..efeef1a65 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -7,17 +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 swift_container_packages = ['openstack-swift-container'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_container_packages = ['swift-container'] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_container_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block swift_container_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index dac92d375..7b2d9efd5 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -7,18 +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' %}
-        # RDO packages swift-object-expirer in openstack-swift-proxy
-        {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_object_expirer_packages = ['swift-object-expirer'] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block swift_object_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 67040e51e..ef32e6879 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -7,17 +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 swift_object_packages = ['openstack-swift-object'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_object_packages = ['swift-object'] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_object_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block swift_object_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 4d57b32e3..a73dd61e5 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -7,31 +7,12 @@ 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 swift_proxy_server_packages = [
-            'openstack-swift-proxy',
-            'python3-ceilometermiddleware'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set swift_proxy_server_packages = [
-            'swift-proxy',
-            'python3-ceilometermiddleware'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 {% set swift_proxy_server_pip_packages = [
     'ceilometermiddleware'
 ] %}
 
 RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block swift_proxy_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}