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

4 files changed, 5 insertions, 60 deletions

diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index 8aa2c14e7..0a193c060 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -7,27 +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 barbican_api_packages = [
-                'openstack-barbican-api',
-                'uwsgi-plugin-python3'
-       ] %}
-
-{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-        {% set barbican_api_packages = [
-                'barbican-api',
-                'uwsgi-plugin-python3'
-        ] %}
-
-{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
-
-    {% endif %}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start
 
 RUN chmod 755 /usr/local/bin/kolla_barbican_extend_start
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 9b28727e5..3f749a5f3 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -9,21 +9,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='barbican', groups='nfast') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set barbican_base_packages = ['openstack-barbican-common'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set barbican_base_packages = ['barbican-common'] %}
-    {% endif %}
-
-{{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
+{% elif base_package_type == 'deb' %}
+    {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
+{% endif %}
 
 {{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
 
@@ -41,8 +31,6 @@ RUN ln -s barbican-base-source/* barbican \
     && cp -r /barbican/etc/barbican/* /etc/barbican/ \
     && chown -R barbican: /etc/barbican
 
-{% endif %}
-
 COPY barbican_sudoers /etc/sudoers.d/kolla_barbican_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index 632fe00c4..e3cfd2e57 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/docker/barbican/barbican-keystone-listener/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 barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
-    {% elif base_package_type == 'deb' %}
-       {% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
-    {% endif %}
-
-{{ macros.install_packages(barbican_keystone_listener_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block barbican_keystone_listener_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
index 8595e54cc..8e40f6e28 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/docker/barbican/barbican-worker/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 barbican_worker_packages = ['openstack-barbican-worker'] %}
-    {% elif base_package_type == 'deb' %}
-       {% set barbican_worker_packages = ['barbican-worker'] %}
-    {% endif %}
-
-{{ macros.install_packages(barbican_worker_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block barbican_worker_footer %}{% endblock %}
 {% block footer %}{% endblock %}