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

diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index b54367fbf..b5d70f9bb 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -7,30 +7,13 @@ 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 manila_api_packages = [
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set manila_api_packages = [
-                'manila-api'
-        ] %}
-    {% endif %}
-{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/manila \
-    && cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi
-
-{% elif install_type == 'source' %}
-
-    {% set manila_api_packages = [
-    ] %}
+{% set manila_api_packages = [
+] %}
 {{ macros.install_packages(manila_api_packages | customizable("packages")) }}
 
 RUN mkdir -p /var/www/cgi-bin/manila \
     && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
 RUN chmod 755 /usr/local/bin/kolla_manila_extend_start \
     && chown -R manila: /var/www/cgi-bin/manila \
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index c7397346a..fe52c6d67 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -10,35 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['openvswitch']) }}
 {{ macros.configure_user(name='manila') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
+{% if base_package_type == 'rpm' %}
 
-        {% set manila_base_packages = [
-                'openstack-manila',
-                'openvswitch'
-        ] %}
+    {% set manila_base_packages = ['openvswitch'] %}
 
-    {% elif base_package_type == 'deb' %}
+{% elif base_package_type == 'deb' %}
 
-        {% set manila_base_packages = [
-                'manila-common',
-                'openvswitch-switch'
-        ] %}
+    {% set manila_base_packages = ['openvswitch-switch'] %}
 
-    {% endif %}
-
-{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set manila_base_packages = ['openvswitch'] %}
-
-    {% elif base_package_type == 'deb' %}
-
-        {% set manila_base_packages = ['openvswitch-switch'] %}
-
-    {% endif %}
+{% endif %}
 
 {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
 
@@ -55,8 +35,6 @@ RUN ln -s manila-base-source/* manila \
     && chown -R manila: /etc/manila /var/cache/manila \
     && 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/manila/rootwrap.conf
 
-{% endif %}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers
 
diff --git a/docker/manila/manila-data/Dockerfile.j2 b/docker/manila/manila-data/Dockerfile.j2
index 1c988186a..391ad2d52 100644
--- a/docker/manila/manila-data/Dockerfile.j2
+++ b/docker/manila/manila-data/Dockerfile.j2
@@ -7,29 +7,17 @@ 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' %}
+{% if base_package_type == 'rpm' %}
 
-        {% set manila_data_packages = [
-                'manila-data'
-        ] %}
+    {% set manila_data_packages = [
+        'nfs-utils'
+    ] %}
 
-    {% endif %}
+{% elif base_package_type == 'deb' %}
 
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set manila_data_packages = [
-                'nfs-utils'
-        ] %}
-
-     {% elif base_package_type == 'deb' %}
-
-        {% set manila_data_packages = [
-                'nfs-common'
-        ] %}
-
-    {% endif %}
+    {% set manila_data_packages = [
+        'nfs-common'
+    ] %}
 
 {% endif %}
 
diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2
index b2330ecb6..1af471946 100644
--- a/docker/manila/manila-scheduler/Dockerfile.j2
+++ b/docker/manila/manila-scheduler/Dockerfile.j2
@@ -7,18 +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 manila_scheduler_packages = [
-                'manila-scheduler'
-        ] %}
-
-{{ macros.install_packages(manila_scheduler_packages | customizable("packages")) }}
-
-    {% endif%}
-{% endif%}
-
 {% block manila_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index 68e853455..8ed170db4 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/docker/manila/manila-share/Dockerfile.j2
@@ -9,53 +9,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['ceph']) }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-
-        {% set manila_share_packages = [
-            'openstack-manila-share',
-            'ceph-common',
-            'glusterfs-fuse',
-            'sqlite',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set manila_share_packages = [
-            'manila-share',
-            'ceph-common',
-            'glusterfs-client',
-            'python3-cephfs',
-            'python3-rados',
-            'python3-rbd',
-            'sqlite3'
-        ] %}
-
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set manila_share_packages = [
+        'ceph-common',
+        'glusterfs-fuse',
+        'sqlite',
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set manila_share_packages = [
+        'ceph-common',
+        'glusterfs-client',
+        'python3-cephfs',
+        'python3-rados',
+        'python3-rbd',
+        'sqlite3'
+    ] %}
 
-{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
-
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set manila_share_packages = [
-            'ceph-common',
-            'glusterfs-fuse',
-            'sqlite',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set manila_share_packages = [
-            'ceph-common',
-            'glusterfs-client',
-            'python3-cephfs',
-            'python3-rados',
-            'python3-rbd',
-            'sqlite3'
-        ] %}
-
-    {% endif %}
+{% endif %}
 
 {{ macros.install_packages(manila_share_packages | customizable("packages")) }}
 
-{% endif %}
-
 {% block manila_share_footer %}{% endblock %}
 {% block footer %}{% endblock %}