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, 39 insertions, 121 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index a342d7636..aec2d674c 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -7,30 +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 cinder_api_packages = [
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set cinder_api_packages = [
-                'cinder-api'
-        ] %}
-    {% endif %}
-{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/cinder \
-    && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
-
-{% elif install_type == 'source' %}
-        {% set cinder_api_packages = [
-        ] %}
+{% set cinder_api_packages = [
+] %}
 
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 
 RUN mkdir -p /var/www/cgi-bin/cinder \
     && cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
 RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start \
     && chown -R cinder: /var/www/cgi-bin/cinder \
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index 743852a25..d92c17896 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/docker/cinder/cinder-backup/Dockerfile.j2
@@ -7,29 +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 cinder_backup_packages = [
-                'nfs-utils'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set cinder_backup_packages = [
-                'cinder-backup',
-                'nfs-common'
-        ] %}
-    {% endif %}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set cinder_backup_packages = [
-                'nfs-utils'
-        ] %}
-     {% elif base_package_type == 'deb' %}
-        {% set cinder_backup_packages = [
-                'nfs-common'
-        ] %}
-    {% endif %}
-
+{% if base_package_type == 'rpm' %}
+    {% set cinder_backup_packages = [
+        'nfs-utils'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set cinder_backup_packages = [
+        'nfs-common'
+    ] %}
 {% endif %}
 
 {{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 08b4ec51d..9503163b3 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -11,49 +11,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['ceph']) }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set cinder_base_packages = [
-                'ceph-common',
-                'lvm2',
-                'cryptsetup',
-                'openstack-cinder',
-                'python3-automaton',
-                'python3-oslo-vmware'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set cinder_base_packages = [
-                'ceph-common',
-                'cinder-common',
-                'lvm2',
-                'cryptsetup',
-                'python3-cephfs',
-                'python3-oslo.vmware',
-                'python3-rados',
-                'python3-rbd'
-        ] %}
-    {% endif %}
-{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set cinder_base_packages = [
-                'ceph-common',
-                'cryptsetup',
-                'lvm2',
-                'qemu-img'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set cinder_base_packages = [
-                'ceph-common',
-                'lvm2',
-                'cryptsetup',
-                'python3-cephfs',
-                'python3-rados',
-                'python3-rbd',
-                'qemu-utils'
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set cinder_base_packages = [
+        'ceph-common',
+        'cryptsetup',
+        'lvm2',
+        'qemu-img'
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set cinder_base_packages = [
+        'ceph-common',
+        'lvm2',
+        'cryptsetup',
+        'python3-cephfs',
+        'python3-rados',
+        'python3-rbd',
+        'qemu-utils'
+    ] %}
+{% endif %}
 {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
 
 {% set cinder_base_pip_packages = [
@@ -68,8 +43,6 @@ RUN ln -s cinder-base-source/* cinder \
     && chown -R cinder: /etc/cinder \
     && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/cinder/rootwrap.conf
 
-{% endif %}
-
 COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index 8e01bafdc..15e7bc8f4 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker/cinder/cinder-scheduler/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 == 'deb' %}
-        {% set cinder_scheduler_packages = [
-                'cinder-scheduler'
-        ] %}
-
-{{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
-
-    {% endif %}
-{% endif %}
-
 {% block cinder_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 4bad98290..afc529ab5 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -9,34 +9,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set cinder_volume_packages = [
-            'nfs-utils',
-            'nvmetcli',
-            'sysfsutils',
-            'targetcli'
+        'nfs-utils',
+        'nvmetcli',
+        'sysfsutils',
+        'targetcli'
     ] %}
-    {% if install_type == 'binary' %}
-        {% set cinder_volume_packages = cinder_volume_packages + [
-            'python3-rtslib'
-        ] %}
-    {% endif %}
-
 {% elif base_package_type == 'deb' %}
     {% set cinder_volume_packages = [
-            'lsscsi',
-            'nfs-common',
-            'nvme-cli',
-            'sysfsutils',
-            'targetcli-fb',
-            'thin-provisioning-tools',
-            'tgt'
+        'lsscsi',
+        'nfs-common',
+        'nvme-cli',
+        'sysfsutils',
+        'targetcli-fb',
+        'thin-provisioning-tools',
+        'tgt'
     ] %}
-    {% if install_type == 'binary' %}
-        {% set cinder_volume_packages = cinder_volume_packages + [
-            'cinder-volume',
-            'python3-rtslib-fb'
-        ] %}
-    {% endif %}
-
 {% endif %}
 
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}