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, 2 insertions, 79 deletions

diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index 13f08f53a..3bf4626a6 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-api/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 aodh_api_packages = ['openstack-aodh-api'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set aodh_api_packages = ['aodh-api'] %}
-    {% endif %}
-{{ macros.install_packages(aodh_api_packages | customizable("packages")) }}
-
-    {% if base_package_type == 'deb' %}
-RUN rm -rf /etc/apache2/sites-enabled/aodh-api.conf
-    {% endif %}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start
 RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
 
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index ce4b88675..cd61ca21a 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -9,34 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='aodh') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-       {# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
-       {% set aodh_base_packages = [
-            'openstack-aodh-api',
-            'openstack-aodh-common',
-        ] %}
-
-{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
-    && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/
-    {% elif base_package_type == 'deb' %}
-
-       {% set aodh_base_packages = [
-            'aodh-common',
-            'python3-aodh',
-        ] %}
-
-{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
-    && cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-   {% set aodh_base_packages = [
-    ] %}
+{% set aodh_base_packages = [
+] %}
 
 {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/aodh
@@ -53,8 +27,6 @@ RUN ln -s aodh-base-source/* aodh \
     && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
     && chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
 
diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2
index 7420c96ab..dc8fa55a9 100644
--- a/docker/aodh/aodh-evaluator/Dockerfile.j2
+++ b/docker/aodh/aodh-evaluator/Dockerfile.j2
@@ -7,15 +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 aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set aodh_evaluator_packages = ['aodh-evaluator'] %}
-    {% endif %}
-{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}
-
-{% endif %}
 {% block aodh_evaluator_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2
index 278f3ab0e..7de6cc3f6 100644
--- a/docker/aodh/aodh-expirer/Dockerfile.j2
+++ b/docker/aodh/aodh-expirer/Dockerfile.j2
@@ -7,15 +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 aodh_expirer_packages = ['openstack-aodh-expirer'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set aodh_expirer_packages = ['aodh-expirer'] %}
-    {% endif %}
-{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}
-
-{% endif %}
 {% block aodh_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2
index 2cc890b68..c6890177d 100644
--- a/docker/aodh/aodh-listener/Dockerfile.j2
+++ b/docker/aodh/aodh-listener/Dockerfile.j2
@@ -7,15 +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 aodh_listener_packages = ['openstack-aodh-listener'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set aodh_listener_packages = ['aodh-listener'] %}
-    {% endif %}
-{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}
-
-{% endif %}
 {% block aodh_listener_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2
index 14cd1550c..a7777aaaa 100644
--- a/docker/aodh/aodh-notifier/Dockerfile.j2
+++ b/docker/aodh/aodh-notifier/Dockerfile.j2
@@ -7,15 +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 aodh_notifier_packages = ['openstack-aodh-notifier'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set aodh_notifier_packages = ['aodh-notifier'] %}
-    {% endif %}
-{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}
-
-{% endif %}
 {% block aodh_notifier_footer %}{% endblock %}
 {% block footer %}{% endblock %}