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

5 files changed, 17 insertions, 90 deletions

diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 0edcf2dc1..31931d148 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='ceilometer') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set ceilometer_base_packages = [
-            'openstack-ceilometer-common',
-            'python3-gnocchiclient',
-            'python3-oslo-db',
-            'python3-tooz'
-         ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_base_packages = [
-            'ceilometer-common',
-            'python3-gnocchiclient',
-         ] %}
-    {% endif %}
-
-{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-
 {% set ceilometer_base_pip_packages = [
     '/ceilometer'
 ] %}
@@ -50,8 +31,6 @@ RUN ln -s ceilometer-base-source/* ceilometer \
         {{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \
     fi
 
-{% endif %}
-
 COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2
index e0f20d253..cfc120e28 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-central/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 ceilometer_central_packages = ['openstack-ceilometer-central'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
-    {% endif %}
-
-{{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
-
-{% endif %}
-
 {% block ceilometer_central_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index e63d253b3..8421ab8ad 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -9,29 +9,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['libvirt']) }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set ceilometer_compute_packages = [
-            'openstack-ceilometer-compute',
-         ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_compute_packages = [
-            'ceilometer-agent-compute',
-            'python3-libvirt'
-         ] %}
-    {% endif %}
-{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set ceilometer_compute_packages = [
-            'python3-libvirt'
-         ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_compute_packages = [
-            'python3-libvirt'
-         ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set ceilometer_compute_packages = [
+        'python3-libvirt'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set ceilometer_compute_packages = [
+        'python3-libvirt'
+    ] %}
+{% endif %}
 
 {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
 
@@ -40,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }}
 
-{% endif %}
-
 {% block ceilometer_compute_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
index 2614b5c33..0bcfba43b 100644
--- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
@@ -7,28 +7,14 @@ 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 ceilometer_ipmi_packages = [
-            'openstack-ceilometer-ipmi'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_ipmi_packages = [
-            'ceilometer-agent-ipmi'
-        ] %}
-    {% endif %}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set ceilometer_ipmi_packages = [
-            'ipmitool'
-         ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_ipmi_packages = [
-            'ipmitool'
-         ] %}
-    {% endif %}
-
+{% if base_package_type == 'rpm' %}
+    {% set ceilometer_ipmi_packages = [
+        'ipmitool'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set ceilometer_ipmi_packages = [
+        'ipmitool'
+    ] %}
 {% endif %}
 
 {{ macros.install_packages(ceilometer_ipmi_packages | customizable("packages")) }}
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index b4b4be5f2..3624d2b12 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/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 ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
-    {% elif base_package_type == 'deb' %}
-        {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
-    {% endif %}
-
-{{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
-
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start
 RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start