Merge "cinder-volume: Install binary python libs only in binary"

Author: Zuul

docker/cinder/cinder-volume/Dockerfile.j2

@@ -11,44 +11,46 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set cinder_volume_packages = [
             'nfs-utils',
             'nvmetcli',
-            'python3-rtslib',
-            'python3-cinderlib',
             'sysfsutils',
             'targetcli'
     ] %}
-{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
-
-{% block cinder_volume_redhat_setup %}
-{% endblock %}
+    {% 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',
-            'python3-rtslib-fb',
             '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")) }}
 
-{% block cinder_volume_ubuntu_setup %}
-RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
-{% endblock %}
+{% if base_package_type == 'rpm' %}
 
-{% endif %}
+{% block cinder_volume_redhat_setup %}
+{% endblock %}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'deb' %}
-        {% set cinder_volume_packages = [
-            'cinder-volume',
-        ] %}
+{% elif base_package_type == 'deb' %}
 
-{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
-    {% endif %}
+{% block cinder_volume_ubuntu_setup %}
+RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
+{% endblock %}
 
 {% endif %}