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, 13 insertions, 68 deletions

diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2
index 9d87bac6a..a0fdfea29 100644
--- a/docker/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-api/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 gnocchi_api_packages = [
-            'gnocchi-api',
-            'gnocchi-common'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set gnocchi_api_packages = ['gnocchi-api'] %}
-    {% endif %}
-{{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}
-
-    {% if base_package_type == 'deb' %}
-RUN rm -rf /etc/apache2/sites-enabled/gnocchi-api.conf
-    {% endif %}
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start
 RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start
 
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 0b68c34f9..9465c9537 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -11,53 +11,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['ceph']) }}
 
-{% if install_type == 'binary' %}
-
-{# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #}
-{{ macros.enable_extra_repos(['epel']) }}
-
-    {% if base_package_type == 'rpm' %}
-
-        {% set gnocchi_base_packages = [
-            'gnocchi-common',
-            'python3-boto3',
-            'python3-rados',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-
-       {% set gnocchi_base_packages = [
-            'build-essential',
-            'gnocchi-common',
-            'librados-dev',
-            'python3-boto3',
-            'python3-dev',
-            'python3-rados',
-            'python3-setuptools',
-            'python3-wheel'
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
 
-{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-       {% set gnocchi_base_packages = [
-            'librados2-devel',
-            'python3-rados',
-        ] %}
+    {% set gnocchi_base_packages = [
+        'librados2-devel',
+        'python3-rados',
+    ] %}
 
-{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/gnocchi
-    {% elif base_package_type == 'deb' %}
+{% elif base_package_type == 'deb' %}
+
+    {% set gnocchi_base_packages = [
+        'librados-dev',
+        'python3-rados',
+    ] %}
 
-       {% set gnocchi_base_packages = [
-            'librados-dev',
-            'python3-rados',
-        ] %}
+
+{% endif %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
 
-   {% endif %}
 ADD gnocchi-base-archive /gnocchi-base-source
 
 {% set gnocchi_base_pip_packages = [
@@ -70,8 +43,6 @@ RUN ln -s gnocchi-base-source/* gnocchi \
     && mkdir -p /etc/gnocchi \
     && chown -R gnocchi: /etc/gnocchi
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers
 
diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
index 4e188654f..26a29cab0 100644
--- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2
@@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
-{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
-{% endif %}
-
 {% block gnocchi_metricd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
index ba641fe3b..d0c09e081 100644
--- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2
@@ -7,11 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if install_type == 'binary' %}
-    {% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}
-{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
-{% endif %}
-
 {% block gnocchi_statsd_footer %}{% endblock %}
 {% block footer %}{% endblock %}